aboutsummaryrefslogtreecommitdiff
path: root/common/timer.h
diff options
context:
space:
mode:
authorMax Horn2005-05-10 23:17:38 +0000
committerMax Horn2005-05-10 23:17:38 +0000
commit72f4c03b0b9a6918a359b967ebc400a2701981d9 (patch)
tree6686cad5726244b7d9d3a4adddde8dea92ce7843 /common/timer.h
parentb75c969e666b9f262a05e0d1e54d56f7d3e45441 (diff)
downloadscummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.tar.gz
scummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.tar.bz2
scummvm-rg350-72f4c03b0b9a6918a359b967ebc400a2701981d9.zip
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
svn-id: r18038
Diffstat (limited to 'common/timer.h')
-rw-r--r--common/timer.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/timer.h b/common/timer.h
index d509402314..8e79c3e2bc 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -33,13 +33,15 @@
class OSystem;
+namespace Common {
+
class Timer {
public:
typedef void (*TimerProc)(void *refCon);
private:
OSystem *_system;
- Common::Mutex _mutex;
+ Mutex _mutex;
void *_timerHandler;
int32 _thisTime;
int32 _lastTime;
@@ -81,6 +83,8 @@ protected:
extern Timer *g_timer;
+} // End of namespace Common
+
#endif
#endif