| Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| index 4115d30c2a66ed2e344ffa277c09b0fca8d441bf..cc7807ba8aaac36f9149426e7dda023185fadf5b 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
|
| @@ -130,12 +130,12 @@
|
| #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
|
| do { \
|
| webrtc::testing::bwe::Logging::GetInstance()->SetGlobalContext(name); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_GLOBAL_ENABLE(enabled) \
|
| do { \
|
| webrtc::testing::bwe::Logging::GetInstance()->SetGlobalEnable(enabled); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define __BWE_TEST_LOGGING_CONTEXT_NAME(ctx, line) ctx ## line
|
| #define __BWE_TEST_LOGGING_CONTEXT_DECLARE(ctx, line, name, time, enabled) \
|
| @@ -155,36 +155,36 @@
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1); \
|
| - } while (0);
|
| + } while (0)
|
| #define BWE_TEST_LOGGING_LOG2(name, format, _1, _2) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2); \
|
| - } while (0);
|
| + } while (0)
|
| #define BWE_TEST_LOGGING_LOG3(name, format, _1, _2, _3) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2, _3); \
|
| - } while (0);
|
| + } while (0)
|
| #define BWE_TEST_LOGGING_LOG4(name, format, _1, _2, _3, _4) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2, _3, \
|
| _4); \
|
| - } while (0);
|
| + } while (0)
|
| #define BWE_TEST_LOGGING_LOG5(name, format, _1, _2, _3, _4, _5) \
|
| do {\
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2, _3, \
|
| _4, _5); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_PLOT(figure, name, time, value) \
|
| do { \
|
| __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name, \
|
| static_cast<int64_t>(time), true); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_PLOT_WITH_NAME(figure, name, time, value, alg_name) \
|
| do { \
|
| @@ -192,21 +192,21 @@
|
| static_cast<int64_t>(time), true); \
|
| webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value, \
|
| alg_name); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_BAR(figure, name, value, flow_id) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->PlotBar(figure, name, value, \
|
| flow_id); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_BASELINEBAR(figure, name, value, flow_id) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->PlotBaselineBar( \
|
| figure, name, value, flow_id); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_ERRORBAR(figure, name, value, ylow, yhigh, title, \
|
| flow_id) \
|
| @@ -214,7 +214,7 @@
|
| BWE_TEST_LOGGING_CONTEXT(name); \
|
| webrtc::testing::bwe::Logging::GetInstance()->PlotErrorBar( \
|
| figure, name, value, ylow, yhigh, title, flow_id); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_LIMITERRORBAR( \
|
| figure, name, value, ylow, yhigh, error_title, ymax, limit_title, flow_id) \
|
| @@ -223,14 +223,14 @@
|
| webrtc::testing::bwe::Logging::GetInstance()->PlotLimitErrorBar( \
|
| figure, name, value, ylow, yhigh, error_title, ymax, limit_title, \
|
| flow_id); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| #define BWE_TEST_LOGGING_LABEL(figure, title, y_label, num_flows) \
|
| do { \
|
| BWE_TEST_LOGGING_CONTEXT(title); \
|
| webrtc::testing::bwe::Logging::GetInstance()->PlotLabel( \
|
| figure, title, y_label, num_flows); \
|
| - } while (0);
|
| + } while (0)
|
|
|
| namespace webrtc {
|
|
|
|
|