Browse Source

Fix a race condition in the file watcher and a few compilation warnings.

undefined
Sam Hocevar 10 years ago
parent
commit
2b4d3318d6
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/input/controller.h
  2. +1
    -1
      src/lol/sys/threadtypes.h
  3. +1
    -1
      src/lolua/baselua.h

+ 1
- 1
src/input/controller.h View File

@@ -326,7 +326,7 @@ public:
MAX, MAX,
}; };
protected: 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; typedef SafeEnum<InputTypeBase> InputType;




+ 1
- 1
src/lol/sys/threadtypes.h View File

@@ -67,7 +67,7 @@ public:
m_mutex.lock(); m_mutex.lock();
long int time = m_time; long int time = m_time;
m_mutex.unlock(); m_mutex.unlock();
return m_time;
return time;
} }
void SetUpdated(bool updated) void SetUpdated(bool updated)
{ {


+ 1
- 1
src/lolua/baselua.h View File

@@ -958,7 +958,7 @@ protected:
static void Release(LuaState* l, Loader* loader); static void Release(LuaState* l, Loader* loader);
static void StoreObject(LuaState* l, Object* obj); static void StoreObject(LuaState* l, Object* obj);
//Virtual Store lua object ------------------------------------------------ //Virtual Store lua object ------------------------------------------------
virtual void Store(Object* obj) { }
virtual void Store(Object* obj) { UNUSED(obj); }


private: private:
LuaState* m_lua_state; LuaState* m_lua_state;


Loading…
Cancel
Save