King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix logical error

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@175 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-07-26 13:09:16 +00:00
parent 612aacfc22
commit 7af7ab498b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/loki/Threads.h
View file

@ -62,7 +62,7 @@ namespace Loki
{ lval = val; } { lval = val; }
}; };
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) #if defined(_WINDOWS_) || defined(_WINDOWS_H) // && defined(__WIN32)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// class template ObjectLevelLockable // class template ObjectLevelLockable

4
tools/RegressionTest/SingletonTest.h
View file

@ -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__)
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) #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__)
#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) #if defined(_WINDOWS_) || defined(_WINDOWS_H) // && defined(__WIN32)
MAKE_TEST(t5) MAKE_TEST(t5)
MAKE_TEST(t6) MAKE_TEST(t6)