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

Back to revision 1109. Accidentally checked in more files than I intended.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1111 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2011-09-20 23:19:14 +00:00
parent 16094ffe39
commit ca6a94ac97
16 changed files with 344 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/ThreadLocal/ThreadLocal.cbp
View file

@ -7,37 +7,28 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug_GCC">
<Option output="obj/Debug_GCC/ThreadLocal" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug_GCC/" />
<Option output="obj\Debug_GCC\ThreadLocal" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Debug_GCC\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-Wmain" />
<Add option="-pedantic" />
<Add option="-g" />
<Add option="-W" />
<Add directory="../../include" />
<Add option="-g" />
<Add directory="..\..\include" />
</Compiler>
<Linker>
<Add library="/usr/lib/libpthread.so" />
<Add library="/usr/lib/libc.so" />
</Linker>
</Target>
<Target title="Release_GCC">
<Option output="obj/Release_GCC/ThreadLocal" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release_GCC/" />
<Option output="obj\Release_GCC\ThreadLocal" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Release_GCC\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-Wmain" />
<Add option="-pedantic" />
<Add option="-W" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add option="-s" />
<Add library="/usr/lib/libpthread.so" />
</Linker>
</Target>
</Build>
@ -50,7 +41,6 @@
<code_completion />
<debugger />
<lib_finder disable_auto="1" />
<envvars />
</Extensions>
</Project>
</CodeBlocks_project_file>

33
test/ThreadLocal/main.cpp
View file

@ -26,7 +26,18 @@
#include <sstream>
#include <iostream>
#include <stdlib.h>
using namespace ::std;
#if !defined( NULL )
#define NULL 0
#endif
// define nullptr even though new compilers will have this keyword just so we
// have a consistent and easy way of identifying which uses of 0 mean null.
#if !defined( nullptr )
#define nullptr NULL
#endif
#if defined(_WIN32)
@ -45,8 +56,6 @@
#else
#include <pthread.h>
#define LOKI_pthread_t \
pthread_t
#define LOKI_pthread_create(handle,attr,func,arg) \
@ -56,19 +65,6 @@
#endif
using namespace ::std;
#if !defined( NULL )
#define NULL 0
#endif
// define nullptr even though new compilers will have this keyword just so we
// have a consistent and easy way of identifying which uses of 0 mean null.
#if !defined( nullptr )
#define nullptr NULL
#endif
// ----------------------------------------------------------------------------
class Thread
@ -368,10 +364,7 @@ bool TestThreadLocalClassStaticValue( void )
// ----------------------------------------------------------------------------
int main( int argc, const char * const argv[] )
{
(void)argc;
(void)argv;
{
bool okay = true;
cout << "Starting ThreadLocal tests." << endl;
cout << "If any tests fail, or any assertions fail," << endl