Changeset 3896


Ignore:
Timestamp:
Apr 7, 2015, 5:08:05 PM (8 years ago)
Author:
sam
Message:

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

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/input/controller.h

    r3891 r3896  
    327327        };
    328328    protected:
    329         virtual bool BuildEnumMap(map<int64_t, String>& enum_map) { return true; }
     329        virtual bool BuildEnumMap(map<int64_t, String>& enum_map) { UNUSED(enum_map); return true; }
    330330    };
    331331    typedef SafeEnum<InputTypeBase> InputType;

  • trunk/src/lol/sys/threadtypes.h

    r3895 r3896  
    6868            long int time = m_time;
    6969            m_mutex.unlock();
    70             return m_time;
     70            return time;
    7171        }
    7272        void SetUpdated(bool updated)

  • trunk/src/lolua/baselua.h

    r3887 r3896  
    959959    static void StoreObject(LuaState* l, Object* obj);
    960960    //Virtual Store lua object ------------------------------------------------
    961     virtual void Store(Object* obj) { }
     961    virtual void Store(Object* obj) { UNUSED(obj); }
    962962
    963963private:
Note: See TracChangeset for help on using the changeset viewer.