[Loki-lib-cvs] SF.net SVN: loki-lib:[1043] trunk/test/LevelMutex

[<ric...@us...>]

Revision: 1043
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1043&view=rev
Author:   rich_sposato
Date:     2009-10-16 05:54:12 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
Renamed Unlocker to remove compiler warning.

Modified Paths:
--------------
    trunk/test/LevelMutex/MultiThreadTests.cpp
    trunk/test/LevelMutex/Thing.hpp

Modified: trunk/test/LevelMutex/MultiThreadTests.cpp
===================================================================
--- trunk/test/LevelMutex/MultiThreadTests.cpp	2009-10-11 05:35:15 UTC (rev 1042)
+++ trunk/test/LevelMutex/MultiThreadTests.cpp	2009-10-16 05:54:12 UTC (rev 1043)
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // 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.
 //
 // Permission to use, copy, modify, distribute and sell this software for any 
@@ -855,7 +855,7 @@
             {
                 thing = LevelThing::GetFromPool( ii );
                 assert( nullptr != thing );
-                LevelThing::Unlocker unlocker( thing->LockHierarchy() );
+                LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
                 (void)unlocker;
                 thing->SetValue( value );
                 ::GoToSleep( 3 );
@@ -867,7 +867,7 @@
                 const unsigned int randomIndex = ( ::rand() % thingCount );
                 thing = LevelThing::GetFromPool( randomIndex );
                 assert( nullptr != thing );
-                LevelThing::Unlocker unlocker( thing->LockHierarchy() );
+                LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
                 (void)unlocker;
                 thing->SetValue( value );
                 ::GoToSleep( 3 );

Modified: trunk/test/LevelMutex/Thing.hpp
===================================================================
--- trunk/test/LevelMutex/Thing.hpp	2009-10-11 05:35:15 UTC (rev 1042)
+++ trunk/test/LevelMutex/Thing.hpp	2009-10-16 05:54:12 UTC (rev 1043)
@@ -1,12 +1,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // 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.
 //
-// Permission to use, copy, modify, distribute and sell this software for any 
-// purpose is hereby granted without fee, provided that the above copyright 
-// notice appear in all copies and that both that copyright notice and this 
+// Permission to use, copy, modify, distribute and sell this software for any
+// purpose is hereby granted without fee, provided that the above copyright
+// notice appear in all copies and that both that copyright notice and this
 // permission notice appear in supporting documentation.
 //
 // The author makes no representations about the suitability of this software
@@ -207,7 +207,7 @@
 {
 public:
 
-    typedef Unlocker< LevelThing > Unlocker;
+    typedef Unlocker< LevelThing > MyUnlocker;
 
     static volatile LevelThing * GetFromPool( unsigned int index );
 
@@ -215,7 +215,7 @@
 
     static void DestroyPool( void );
 
-    Unlocker LockHierarchy( void ) volatile;
+    MyUnlocker LockHierarchy( void ) volatile;
 
     void UnlockHierarchy( void ) volatile;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.