From 2fc8beaa77f23142a03f91b66b6aeffedeeff3c3 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Tue, 11 Dec 2012 23:09:54 +0100 Subject: [PATCH] Fix two compilation errors --- src/collision/narrowphase/EPA/EdgeEPA.h | 1 + src/engine/Timer.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/collision/narrowphase/EPA/EdgeEPA.h b/src/collision/narrowphase/EPA/EdgeEPA.h index cd9f06bf..bc3c64d2 100644 --- a/src/collision/narrowphase/EPA/EdgeEPA.h +++ b/src/collision/narrowphase/EPA/EdgeEPA.h @@ -105,6 +105,7 @@ inline int EdgeEPA::getIndex() const { inline EdgeEPA& EdgeEPA::operator=(const EdgeEPA& edge) { mOwnerTriangle = edge.mOwnerTriangle; mIndex = edge.mIndex; + return *this; } // Return the index of the next counter-clockwise edge of the ownver triangle diff --git a/src/engine/Timer.h b/src/engine/Timer.h index aab7160a..474481ac 100644 --- a/src/engine/Timer.h +++ b/src/engine/Timer.h @@ -153,7 +153,7 @@ inline void Timer::start() { LARGE_INTEGER ticks; QueryPerformanceFrequency(&ticksPerSecond); QueryPerformanceCounter(&ticks); - lastUpdateTime = double(ticks.QuadPart) / double(ticksPerSecond.QuadPart); + mLastUpdateTime = double(ticks.QuadPart) / double(ticksPerSecond.QuadPart); #else // Initialize the lastUpdateTime with the current time in seconds timeval timeValue;