From 1b1f61fe4c925afd8503e87ac656d835519d0d76 Mon Sep 17 00:00:00 2001
From: "Paul \"Dettorer\" Hervot" <p.hervot@gmail.com>
Date: Sun, 29 Nov 2015 10:58:34 +0100
Subject: [PATCH] Profiler: Fix variable shadowing

---
 src/common/profiler.cpp           | 8 ++++----
 src/common/profiler.h             | 2 +-
 src/common/synchronized_wrapper.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp
index 71df6d029..b81af2b36 100644
--- a/src/common/profiler.cpp
+++ b/src/common/profiler.cpp
@@ -90,10 +90,10 @@ void ProfilingManager::FinishFrame() {
     last_frame_end = now;
 }
 
-TimingResultsAggregator::TimingResultsAggregator(size_t window_size)
-        : max_window_size(window_size), window_size(0) {
-    interframe_times.resize(window_size, Duration::zero());
-    frame_times.resize(window_size, Duration::zero());
+TimingResultsAggregator::TimingResultsAggregator(size_t _window_size)
+        : max_window_size(_window_size), window_size(0) {
+    interframe_times.resize(_window_size, Duration::zero());
+    frame_times.resize(_window_size, Duration::zero());
 }
 
 void TimingResultsAggregator::Clear() {
diff --git a/src/common/profiler.h b/src/common/profiler.h
index 2f34ee622..3a6d1e4f3 100644
--- a/src/common/profiler.h
+++ b/src/common/profiler.h
@@ -84,7 +84,7 @@ private:
  */
 class Timer {
 public:
-    Timer(TimingCategory& category) : category(category) {
+    Timer(TimingCategory& _category) : category(_category) {
     }
 
     void Start() {
diff --git a/src/common/synchronized_wrapper.h b/src/common/synchronized_wrapper.h
index 07105a198..a04a515da 100644
--- a/src/common/synchronized_wrapper.h
+++ b/src/common/synchronized_wrapper.h
@@ -38,8 +38,8 @@ private:
 template <typename T>
 class SynchronizedRef {
 public:
-    SynchronizedRef(SynchronizedWrapper<T>& wrapper) : wrapper(&wrapper) {
-        wrapper.mutex.lock();
+    SynchronizedRef(SynchronizedWrapper<T>& _wrapper) : wrapper(&_wrapper) {
+        _wrapper.mutex.lock();
     }
 
     SynchronizedRef(SynchronizedRef&) = delete;