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

Renamed Unlocker to remove compiler warning.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1043 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2009-10-16 05:54:12 +00:00
parent 7d52fcdeb9
commit 65949024b3
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/LevelMutex/MultiThreadTests.cpp
View file

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// Part of LevelMutex test program for The Loki Library // Part of LevelMutex test program for The Loki Library
// Copyright (c) 2008 Richard Sposato // Copyright (c) 2008, 2009 Richard Sposato
// The copyright on this file is protected under the terms of the MIT license. // The copyright on this file is protected under the terms of the MIT license.
// //
// Permission to use, copy, modify, distribute and sell this software for any // Permission to use, copy, modify, distribute and sell this software for any
@ -855,7 +855,7 @@ void * SafeHierarchyTest( void * p )
{ {
thing = LevelThing::GetFromPool( ii ); thing = LevelThing::GetFromPool( ii );
assert( nullptr != thing ); assert( nullptr != thing );
LevelThing::Unlocker unlocker( thing->LockHierarchy() ); LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
(void)unlocker; (void)unlocker;
thing->SetValue( value ); thing->SetValue( value );
::GoToSleep( 3 ); ::GoToSleep( 3 );
@ -867,7 +867,7 @@ void * SafeHierarchyTest( void * p )
const unsigned int randomIndex = ( ::rand() % thingCount ); const unsigned int randomIndex = ( ::rand() % thingCount );
thing = LevelThing::GetFromPool( randomIndex ); thing = LevelThing::GetFromPool( randomIndex );
assert( nullptr != thing ); assert( nullptr != thing );
LevelThing::Unlocker unlocker( thing->LockHierarchy() ); LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
(void)unlocker; (void)unlocker;
thing->SetValue( value ); thing->SetValue( value );
::GoToSleep( 3 ); ::GoToSleep( 3 );

6
test/LevelMutex/Thing.hpp
View file

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// Part of LevelMutex test program for The Loki Library // Part of LevelMutex test program for The Loki Library
// Copyright (c) 2008 Richard Sposato // Copyright (c) 2008, 2009 Richard Sposato
// The copyright on this file is protected under the terms of the MIT license. // The copyright on this file is protected under the terms of the MIT license.
// //
// Permission to use, copy, modify, distribute and sell this software for any // Permission to use, copy, modify, distribute and sell this software for any
@ -207,7 +207,7 @@ class LevelThing
{ {
public: public:
typedef Unlocker< LevelThing > Unlocker; typedef Unlocker< LevelThing > MyUnlocker;
static volatile LevelThing * GetFromPool( unsigned int index ); static volatile LevelThing * GetFromPool( unsigned int index );
@ -215,7 +215,7 @@ public:
static void DestroyPool( void ); static void DestroyPool( void );
Unlocker LockHierarchy( void ) volatile; MyUnlocker LockHierarchy( void ) volatile;
void UnlockHierarchy( void ) volatile; void UnlockHierarchy( void ) volatile;