From 2b4d3318d688e4ce5eed2c3b8bcba25ae0738db4 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 7 Apr 2015 15:08:05 +0000
Subject: [PATCH] Fix a race condition in the file watcher and a few
 compilation warnings.

---
 src/input/controller.h    | 2 +-
 src/lol/sys/threadtypes.h | 2 +-
 src/lolua/baselua.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/input/controller.h b/src/input/controller.h
index 6ac0c625..71766a34 100644
--- a/src/input/controller.h
+++ b/src/input/controller.h
@@ -326,7 +326,7 @@ public:
             MAX,
         };
     protected:
-        virtual bool BuildEnumMap(map<int64_t, String>& enum_map) { return true; }
+        virtual bool BuildEnumMap(map<int64_t, String>& enum_map) { UNUSED(enum_map); return true; }
     };
     typedef SafeEnum<InputTypeBase> InputType;
 
diff --git a/src/lol/sys/threadtypes.h b/src/lol/sys/threadtypes.h
index 2cd188c1..57af6632 100644
--- a/src/lol/sys/threadtypes.h
+++ b/src/lol/sys/threadtypes.h
@@ -67,7 +67,7 @@ public:
             m_mutex.lock();
             long int time = m_time;
             m_mutex.unlock();
-            return m_time;
+            return time;
         }
         void SetUpdated(bool updated)
         {
diff --git a/src/lolua/baselua.h b/src/lolua/baselua.h
index 716f4ab9..60fef844 100644
--- a/src/lolua/baselua.h
+++ b/src/lolua/baselua.h
@@ -958,7 +958,7 @@ protected:
     static void Release(LuaState* l, Loader* loader);
     static void StoreObject(LuaState* l, Object* obj);
     //Virtual Store lua object ------------------------------------------------
-    virtual void Store(Object* obj) { }
+    virtual void Store(Object* obj) { UNUSED(obj); }
 
 private:
     LuaState* m_lua_state;