Keep the scope of `messageStream` constrained

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp
index 0782aa742f..0c91342a57 100644
--- a/src/mbgl/util/stopwatch.hpp
+++ b/src/mbgl/util/stopwatch.hpp
@@ -10,11 +10,14 @@ namespace mbgl {
 namespace util {
     
 #ifdef MBGL_TIMING
+// Declare 'watch' as a shared_ptr so it can be captured by value in a lambda function    
 #define MBGL_TIMING_START(watch)  std::shared_ptr<util::stopwatch> watch = std::make_unique<util::stopwatch>(Event::Timing);
 #define MBGL_TIMING_FINISH(watch, message) \
-    std::stringstream messageStream;  \
-    messageStream << message; \
-    watch->report(messageStream.str());
+    do { \
+        std::stringstream messageStream;  \
+        messageStream << message; \
+        watch->report(messageStream.str()); \
+    } while (0);
 #else
 #define MBGL_TIMING_START(watch)
 #define MBGL_TIMING_FINISH(watch, message)