Expose getPointedThing to Lua

[oweals/minetest.git] / src / util / thread.h

diff --git a/src/util/thread.h b/src/util/thread.h
index f54b8b48f25dfcbfa91002364d17d70bd77d00bb..201d09a08c1110249dd2fbb389f704e843c07916 100644 (file)
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "../irrlichttypes.h"
 #include "../threading/thread.h"
-#include "../threading/mutex.h"
 #include "../threading/mutex_auto_lock.h"
 #include "porting.h"
 #include "log.h"
@@ -51,7 +50,7 @@ public:
        // You pretty surely want to grab the lock when accessing this
        T m_value;
 private:
-       Mutex m_mutex;
+       std::mutex m_mutex;
 };
 
 /*
@@ -83,8 +82,8 @@ public:
        GetRequest() {}
        ~GetRequest() {}
 
-       GetRequest(Key a_key) {
-               key = a_key;
+       GetRequest(const Key &a_key): key(a_key)
+       {
        }
 
        Key key;
@@ -106,7 +105,7 @@ public:
                return m_queue.empty();
        }
 
-       void add(Key key, Caller caller, CallerData callerdata,
+       void add(const Key &key, Caller caller, CallerData callerdata,
                ResultQueue<Key, T, Caller, CallerData> *dest)
        {
                typename std::deque<GetRequest<Key, T, Caller, CallerData> >::iterator i;