make things compile under windows again, there's still some ugly ifdefs

I'd like to get rid of
This commit is contained in:
Peter Tissen 2014-02-24 00:40:03 +01:00
parent 92fb77d50e
commit 1908286e7c
11 changed files with 97 additions and 95 deletions

View file

@ -50,7 +50,10 @@ class be_t
public:
typedef T type;
be_t() noexcept = default;
#ifdef __GNUG__
be_t() noexcept = default
#endif
be_t(){}
be_t(const T& value)
{

View file

@ -96,7 +96,11 @@ public:
m_cur_id = s_first_id;
}
template<typename T = char>
template<typename T
#ifdef __GNUG__
= char
#endif
>
ID_TYPE GetNewID(const std::string& name = "", T* data = nullptr, const u32 attr = 0)
{
std::lock_guard<std::mutex> lock(m_mtx_main);

View file

@ -1,7 +1,12 @@
#include "stdafx.h"
#include "Thread.h"
/*__declspec(thread)*/ thread_local NamedThreadBase* g_tls_this_thread = nullptr;
#ifdef _WIN32
__declspec(thread)
#else
thread_local
#endif
NamedThreadBase* g_tls_this_thread = nullptr;
NamedThreadBase* GetCurrentNamedThread()
{