Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring

Conflicts:
	Makefile
	ios/mapbox-gl-cocoa

1 files changed, 10 insertions, 10 deletions

diff --git a/src/util/timer.cpp b/src/util/timer.cpp
index d56860d193..5c4af51da4 100644
--- a/src/util/timer.cpp
+++ b/src/util/timer.cpp
@@ -8,22 +8,22 @@
 
 using namespace mbgl::util;
 
-timer::timer(Event event)
-    : event(event), start(now()) {}
+timer::timer(Event event_)
+    : event(event_), start(now()) {}
 
-timer::timer(EventSeverity severity, Event event)
-    : severity(severity), event(event), start(now()) {}
+timer::timer(EventSeverity severity_, Event event_)
+    : severity(severity_), event(event_), start(now()) {}
 
-timer::timer(const std::string &name, Event event)
-    : name(name), event(event), start(now()) {}
+timer::timer(const std::string &name_, Event event_)
+    : name(name_), event(event_), start(now()) {}
 
-timer::timer(const std::string &name, EventSeverity severity, Event event)
-    : name(name), severity(severity), event(event), start(now()) {}
+timer::timer(const std::string &name_, EventSeverity severity_, Event event_)
+    : name(name_), severity(severity_), event(event_), start(now()) {}
 
-void timer::report(const std::string &name) {
+void timer::report(const std::string &name_) {
     timestamp duration = now() - start;
 
-    Log::Record(severity, event, name + ": " + std::to_string((double)(duration) / 1_millisecond) + "ms");
+    Log::Record(severity, event, name_ + ": " + std::to_string((double)(duration) / 1_millisecond) + "ms");
     start += duration;
 }