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

Fixed compiler error that occurs when using 64 bit pointers.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@817 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2007-03-01 01:54:23 +00:00
parent 281d57aa5e
commit c95d4ccc74
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/SmartPtr/LockTest.cpp
View file

@ -32,6 +32,8 @@
#define LOKI_WINDOWS_H #define LOKI_WINDOWS_H
#endif #endif
#include <stddef.h>
#include <loki/Threads.h> #include <loki/Threads.h>
#include <loki/StrongPtr.h> #include <loki/StrongPtr.h>
#include <loki/SmartPtr.h> #include <loki/SmartPtr.h>
@ -371,13 +373,14 @@ SelfLockedA * SelfLockedA::s_instance = NULL;
void * RunLocked( void * id ) void * RunLocked( void * id )
{ {
A_Lockable_ptr ap( SafeA::GetIt().GetA() ); A_Lockable_ptr ap( SafeA::GetIt().GetA() );
const int threadIndex = reinterpret_cast< int >( id ); const ptrdiff_t threadIndex = reinterpret_cast< ptrdiff_t >( id );
const int index = static_cast< int >( threadIndex );
for( unsigned int i = 0; i < loop; i++ ) for( unsigned int i = 0; i < loop; i++ )
{ {
ap.Lock(); ap.Lock();
Loki::ScopeGuard unlockGuard = MakeGuard( &A_Lockable_ptr::Unlock, ap ); Loki::ScopeGuard unlockGuard = MakeGuard( &A_Lockable_ptr::Unlock, ap );
(void)unlockGuard; (void)unlockGuard;
ap->Print( threadIndex ); ap->Print( index );
} }
return 0; return 0;
} }
@ -387,17 +390,18 @@ void * RunLocked( void * id )
void * RunLockedStorage( void * id ) void * RunLockedStorage( void * id )
{ {
A_Locked_ptr ap( SelfLockedA::GetIt().GetA() ); A_Locked_ptr ap( SelfLockedA::GetIt().GetA() );
const int threadIndex = reinterpret_cast< int >( id ); const ptrdiff_t threadIndex = reinterpret_cast< ptrdiff_t >( id );
const int index = static_cast< int >( threadIndex );
int j = 0; int j = 0;
for( unsigned int i = 0; i < loop; i++ ) for( unsigned int i = 0; i < loop; i++ )
{ {
ap->Print( threadIndex, j ); ap->Print( index, j );
j++; j++;
#ifdef DO_EXTRA_LOKI_TESTS #ifdef DO_EXTRA_LOKI_TESTS
ap->Print( threadIndex, j ); ap->Print( index, j );
j++; j++;
A_Locked_ptr ap1( ap ); A_Locked_ptr ap1( ap );
ap1->Print( threadIndex, j ); ap1->Print( index, j );
j++; j++;
#endif #endif
} }
@ -408,10 +412,11 @@ void * RunLockedStorage( void * id )
void * Run( void * id ) void * Run( void * id )
{ {
A_ptr ap( UnsafeA::GetIt().GetA() ); A_ptr ap( UnsafeA::GetIt().GetA() );
const int threadIndex = reinterpret_cast< int >( id ); const ptrdiff_t threadIndex = reinterpret_cast< ptrdiff_t >( id );
const int index = static_cast< int >( threadIndex );
for( unsigned int i = 0; i < loop; i++ ) for( unsigned int i = 0; i < loop; i++ )
{ {
ap->Print( threadIndex ); ap->Print( index );
} }
return 0; return 0;
} }