Cleanup use of "do { ... } while (0)".

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 112 matching lines @@
 #include <stack>
 #include <string>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_types.h"
 
 #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) \
     webrtc::testing::bwe::Logging::Context \
         __BWE_TEST_LOGGING_CONTEXT_NAME(ctx, line)(name, time, enabled)
 
 #define BWE_TEST_LOGGING_CONTEXT(name) \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __LINE__, name, -1, true)
 #define BWE_TEST_LOGGING_ENABLE(enabled) \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __LINE__, "", -1, \
                                        static_cast<bool>(enabled))
 #define BWE_TEST_LOGGING_TIME(time) \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __LINE__, "", \
                                        static_cast<int64_t>(time), true)
 
 #define BWE_TEST_LOGGING_LOG1(name, format, _1) \
     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 {                                                                       \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,           \
                                        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)                                 \
   do {                                                                     \
     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) \
   do {                                                                         \
     BWE_TEST_LOGGING_CONTEXT(name);                                            \
     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 {
 
 class CriticalSectionWrapper;
 
 namespace testing {
 namespace bwe {
 
 class Logging {
  public:
@@ skipping 70 matching lines @@
   ThreadMap thread_map_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Logging);
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_