zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make FieldTrialOptionals operator bool() explicit

Browse Source 
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}
This commit is contained in:
Jonas Olsson
2019-03-12 13:57:15 +01:00
committed by Commit Bot
parent bf40c380ae
commit cb96809e46
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtc_base/experiments/field_trial_parser.h
View File

@ -183,7 +183,7 @@ class FieldTrialOptional : public FieldTrialParameterInterface {
const T& Value() const { return value_.value(); } const T& Value() const { return value_.value(); }
const T& operator*() const { return value_.value(); } const T& operator*() 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: protected:
bool Parse(absl::optional<std::string> str_value) override { bool Parse(absl::optional<std::string> str_value) override {

2
rtc_base/experiments/rate_control_settings.cc
View File

@ -147,7 +147,7 @@ RateControlSettings RateControlSettings::ParseFromKeyValueConfig(
} }
bool RateControlSettings::UseCongestionWindow() const { bool RateControlSettings::UseCongestionWindow() const {
return congestion_window_; return static_cast<bool>(congestion_window_);
} }
int64_t RateControlSettings::GetCongestionWindowAdditionalTimeMs() const { int64_t RateControlSettings::GetCongestionWindowAdditionalTimeMs() const {