Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Core/Headers/ApplicationTimer.h

Diff revisions: vs.
  @@ -25,10 +25,6 @@
25 25
26 26 #include "Core\Math\Headers\MathHelper.h"
27 27
28 - #if defined ( OS_WINDOWS )
29 - #include <windows.h>
30 - #endif
31 -
32 28 //Code from http://www.gamedev.net/reference/articles/article1382.asp
33 29 //Copyright: "Frame Rate Independent Movement" by Ben Dilts
34 30
  @@ -139,7 +135,7 @@
139 135 };
140 136
141 137 inline ProfileTimer* ADD_TIMER(const char* timerName) {
142 - ProfileTimer* timer = New ProfileTimer();
138 + ProfileTimer* timer = MemoryManager_NEW ProfileTimer();
143 139 timer->create(timerName);
144 140 return timer;
145 141 }
  @@ -160,7 +156,7 @@
160 156 }
161 157
162 158 inline void REMOVE_TIMER(ProfileTimer*& timer) {
163 - MemoryManager::SAFE_DELETE(timer);
159 + MemoryManager::DELETE(timer);
164 160 }
165 161
166 162 inline U64 GETUSTIME() {
  @@ -175,7 +171,8 @@
175 171 return getUsToMs(GETUSTIME());
176 172 }
177 173
178 - /// The following functions force a timer update (a call to query performance timer. Use these for profiling!
174 + /// The following functions force a timer update (a call to query performance timer.
175 + /// Use these for profiling!
179 176 inline U64 GETUSTIME(bool state) {
180 177 return ApplicationTimer::getInstance().getElapsedTime(state);
181 178 }