mingw thread support
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@171 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
baa2869479
commit
da963073d4
3 changed files with 5 additions and 5 deletions
|
@ -62,7 +62,7 @@ namespace Loki
|
||||||
{ lval = val; }
|
{ lval = val; }
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _WINDOWS_
|
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32)
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// class template ObjectLevelLockable
|
// class template ObjectLevelLockable
|
||||||
|
@ -81,7 +81,7 @@ namespace Loki
|
||||||
::InitializeCriticalSection(&mtx_);
|
::InitializeCriticalSection(&mtx_);
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectLevelLockable( const ObjectLevelLockable& )
|
ObjectLevelLockable(const ObjectLevelLockable&)
|
||||||
{
|
{
|
||||||
::InitializeCriticalSection(&mtx_);
|
::InitializeCriticalSection(&mtx_);
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ namespace
|
||||||
typedef SingletonHolder<MyClass<20>, CreateStatic, NoDestroy, SingleThreaded> t20;
|
typedef SingletonHolder<MyClass<20>, CreateStatic, NoDestroy, SingleThreaded> t20;
|
||||||
|
|
||||||
//#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
|
//#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
|
||||||
#ifdef _WINDOWS_
|
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32)
|
||||||
|
|
||||||
typedef SingletonHolder<MyClass<5>, CreateUsingNew, DefaultLifetime, ClassLevelLockable> t5;
|
typedef SingletonHolder<MyClass<5>, CreateUsingNew, DefaultLifetime, ClassLevelLockable> t5;
|
||||||
typedef SingletonHolder<MyClass<6>, CreateUsingNew, PhoenixSingleton, ClassLevelLockable> t6;
|
typedef SingletonHolder<MyClass<6>, CreateUsingNew, PhoenixSingleton, ClassLevelLockable> t6;
|
||||||
|
@ -128,7 +128,7 @@ public:
|
||||||
MAKE_TEST(t20)
|
MAKE_TEST(t20)
|
||||||
|
|
||||||
//#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
|
//#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
|
||||||
#ifdef _WINDOWS_
|
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32)
|
||||||
|
|
||||||
MAKE_TEST(t5)
|
MAKE_TEST(t5)
|
||||||
MAKE_TEST(t6)
|
MAKE_TEST(t6)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# pragma warning(disable: 4018 4097 4100 4213 4290 4512 4514 4700 4702 4710 4786 4800)
|
# pragma warning(disable: 4018 4097 4100 4213 4290 4512 4514 4700 4702 4710 4786 4800)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||||
#include <Windows.h> // for threads, part of the sdk, disable if not found
|
#include <Windows.h> // for threads, part of the sdk, disable if not found
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue