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

bug fix, default threading support

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@178 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-07-26 14:33:30 +00:00
parent c3da9552e6
commit 1237efed14
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/loki/Singleton.h
View file

@ -29,6 +29,10 @@
#define C_CALLING_CONVENTION_QUALIFIER #define C_CALLING_CONVENTION_QUALIFIER
#endif #endif
#ifndef SINGLETON_DEFAULT_THREADING
#define SINGLETON_DEFAULT_THREADING ::Loki::SingleThreaded
#endif
namespace Loki namespace Loki
{ {
typedef void (C_CALLING_CONVENTION_QUALIFIER *atexit_pfn_t)(); typedef void (C_CALLING_CONVENTION_QUALIFIER *atexit_pfn_t)();
@ -337,7 +341,7 @@ namespace Loki
typename T, typename T,
template <class> class CreationPolicy = CreateUsingNew, template <class> class CreationPolicy = CreateUsingNew,
template <class> class LifetimePolicy = DefaultLifetime, template <class> class LifetimePolicy = DefaultLifetime,
template <class> class ThreadingModel = SingleThreaded template <class> class ThreadingModel = SINGLETON_DEFAULT_THREADING
> >
class SingletonHolder class SingletonHolder
{ {

9
tools/RegressionTest/Test.cpp
View file

@ -18,8 +18,11 @@
# 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
//#define DEFAULT_THREADING ::Loki::ObjectLevelLockable //#define TEST_THREADS
//#define DEFAULT_THREADING ::Loki::ClassLevelLockable #ifdef TEST_THREADS
#define DEFAULT_THREADING ::Loki::ClassLevelLockable
#define SINGLETON_DEFAULT_THREADING ::Loki::ClassLevelLockable
#endif
#if defined(_MSC_VER) || defined(__MINGW32__) #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
@ -55,7 +58,7 @@ Test::tests_type Test::tests;
#include "AssocVectorTest.h" #include "AssocVectorTest.h"
#include "FunctorTest.h" #include "FunctorTest.h"
#include "DataGeneratorsTest.h" #include "DataGeneratorsTest.h"
/* */
/* /*
* AP - All Pass * AP - All Pass
* FC - Fails to Compile * FC - Fails to Compile