FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comprimise for Visual Studio 6 by using 'using namespace OpenThreads'.

Browse Source
This commit is contained in:
Don BURNS 2004-11-29 05:32:04 +00:00
parent 463b47f020
commit 0810c733d0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgDB/ReentrantMutex.cpp
View File

@ -15,6 +15,7 @@
using namespace osgDB;
using namespace OpenThreads;
ReentrantMutex::ReentrantMutex():
_threadHoldingMutex(0),
@ -35,7 +36,7 @@ int ReentrantMutex::lock()
}
else
{
int result = OpenThreads::Mutex::lock();
int result = /*OpenThreads::*/Mutex::lock();
if (result==0)
{
_threadHoldingMutex = OpenThreads::Thread::CurrentThread();
@ -50,7 +51,7 @@ int ReentrantMutex::unlock()
if (_threadHoldingMutex==OpenThreads::Thread::CurrentThread() && _lockCount>0)
{
--_lockCount;
if (_lockCount<=0) return OpenThreads::Mutex::unlock();
if (_lockCount<=0) return Mutex::unlock();
}
return 0;
}
@ -64,7 +65,7 @@ int ReentrantMutex::trylock()
}
else
{
int result = OpenThreads::Mutex::trylock();
int result = Mutex::trylock();
if (result==0)
{
_threadHoldingMutex = OpenThreads::Thread::CurrentThread();