oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove threads.h and replace its definitions with their C++11 equivalents (#5957)

Browse source 
This also changes threadProc's signature, since C++11 supports arbitrary
thread function signatures.
This commit is contained in:
ShadowNinja 2017-06-11 03:43:05 -04:00 • committed by Loïc Blot
parent 5cc8ad946e
commit 6c5e5e2023
16 changed files with 82 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/itemdef.cpp
View file

@ -245,7 +245,7 @@ public:
{
#ifndef SERVER
m_main_thread = thr_get_current_thread_id();
m_main_thread = std::this_thread::get_id();
#endif
clear();
}
@ -320,7 +320,7 @@ public:
<<name<<"\""<<std::endl;
// This is not thread-safe
sanity_check(thr_is_current_thread(m_main_thread));
sanity_check(std::this_thread::get_id() == m_main_thread);
// Skip if already in cache
ClientCached *cc = NULL;
@ -356,15 +356,12 @@ public:
{
ClientCached *cc = NULL;
m_clientcached.get(name, &cc);
if(cc)
if (cc)
return cc;
if(thr_is_current_thread(m_main_thread))
{
if (std::this_thread::get_id() == m_main_thread) {
return createClientCachedDirect(name, client);
}
else
{
} else {
// We're gonna ask the result to be put into here
static ResultQueue<std::string, ClientCached*, u8, u8> result_queue;
@ -580,7 +577,7 @@ private:
StringMap m_aliases;
#ifndef SERVER
// The id of the thread that is allowed to use irrlicht directly
threadid_t m_main_thread;
std::thread::id m_main_thread;
// A reference to this can be returned when nothing is found, to avoid NULLs
mutable ClientCached m_dummy_clientcached;
// Cached textures and meshes