From cb96809e46752a2ab11d7618d9b6b4191dc84f7f Mon Sep 17 00:00:00 2001
From: Jonas Olsson <jonasolsson@webrtc.org>
Date: Tue, 12 Mar 2019 13:57:15 +0100
Subject: [PATCH] Make FieldTrialOptionals operator bool() explicit

Implicit bool conversions behave wierdly in a bunch of cases, so let's make it explicit.

Bug: None
Change-Id: I15933e90d57c57218eed9608407aace5a640a6ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127284
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27076}
---
 rtc_base/experiments/field_trial_parser.h     | 2 +-
 rtc_base/experiments/rate_control_settings.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rtc_base/experiments/field_trial_parser.h b/rtc_base/experiments/field_trial_parser.h
index 0330f1970a..f723b3b49b 100644
--- a/rtc_base/experiments/field_trial_parser.h
+++ b/rtc_base/experiments/field_trial_parser.h
@@ -183,7 +183,7 @@ class FieldTrialOptional : public FieldTrialParameterInterface {
   const T& Value() const { return value_.value(); }
   const T& operator*() const { return value_.value(); }
   const T* operator->() const { return &value_.value(); }
-  operator bool() const { return value_.has_value(); }
+  explicit operator bool() const { return value_.has_value(); }
 
  protected:
   bool Parse(absl::optional<std::string> str_value) override {
diff --git a/rtc_base/experiments/rate_control_settings.cc b/rtc_base/experiments/rate_control_settings.cc
index 4e2d745a68..608996b8ac 100644
--- a/rtc_base/experiments/rate_control_settings.cc
+++ b/rtc_base/experiments/rate_control_settings.cc
@@ -147,7 +147,7 @@ RateControlSettings RateControlSettings::ParseFromKeyValueConfig(
 }
 
 bool RateControlSettings::UseCongestionWindow() const {
-  return congestion_window_;
+  return static_cast<bool>(congestion_window_);
 }
 
 int64_t RateControlSettings::GetCongestionWindowAdditionalTimeMs() const {