N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Profiler: Fix variable shadowing

Browse source
This commit is contained in:
Paul "Dettorer" Hervot 2015-11-29 10:58:34 +01:00 committed by Paul Dettorer Hervot
parent 58180a2db0
commit 1b1f61fe4c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/profiler.cpp
View file

@ -90,10 +90,10 @@ void ProfilingManager::FinishFrame() {
last_frame_end = now; last_frame_end = now;
} }
TimingResultsAggregator::TimingResultsAggregator(size_t window_size) TimingResultsAggregator::TimingResultsAggregator(size_t _window_size)
: max_window_size(window_size), window_size(0) { : max_window_size(_window_size), window_size(0) {
interframe_times.resize(window_size, Duration::zero()); interframe_times.resize(_window_size, Duration::zero());
frame_times.resize(window_size, Duration::zero()); frame_times.resize(_window_size, Duration::zero());
} }
void TimingResultsAggregator::Clear() { void TimingResultsAggregator::Clear() {

2
src/common/profiler.h
View file

@ -84,7 +84,7 @@ private:
*/ */
class Timer { class Timer {
public: public:
Timer(TimingCategory& category) : category(category) { Timer(TimingCategory& _category) : category(_category) {
} }
void Start() { void Start() {

4
src/common/synchronized_wrapper.h
View file

@ -38,8 +38,8 @@ private:
template <typename T> template <typename T>
class SynchronizedRef { class SynchronizedRef {
public: public:
SynchronizedRef(SynchronizedWrapper<T>& wrapper) : wrapper(&wrapper) { SynchronizedRef(SynchronizedWrapper<T>& _wrapper) : wrapper(&_wrapper) {
wrapper.mutex.lock(); _wrapper.mutex.lock();
} }
SynchronizedRef(SynchronizedRef&) = delete; SynchronizedRef(SynchronizedRef&) = delete;