From e46d1cf9412819c4f5df07891ddfbe3db0e614e4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 21 Aug 2003 09:52:12 +0000
Subject: [PATCH] Moved OpenThreads::Threads::Yield() calls across to new
 OpenThreads::Threads::YieldCurrentThread() naming.

---
 src/osgDB/DatabasePager.cpp              | 5 ++---
 src/osgPlugins/txp/trPagePageManager.cpp | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 05fc8c88a..f41324197 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -33,8 +33,7 @@ DatabasePager::~DatabasePager()
         while(isRunning())
         {
             std::cout<<"Waiting for RenderSurface to cancel"<<std::endl;
-            //OpenThreads::Thread::YieldCurrentThread();
-            OpenThreads::Thread::Yield();
+            OpenThreads::Thread::YieldCurrentThread();
         }
         
     }
@@ -285,7 +284,7 @@ void DatabasePager::run()
         }
         
         // go to sleep till our the next time our thread gets scheduled.
-        Yield();
+        YieldCurrentThread();
 
     }
     
diff --git a/src/osgPlugins/txp/trPagePageManager.cpp b/src/osgPlugins/txp/trPagePageManager.cpp
index e8ec36f85..3ddddd82c 100644
--- a/src/osgPlugins/txp/trPagePageManager.cpp
+++ b/src/osgPlugins/txp/trPagePageManager.cpp
@@ -158,8 +158,7 @@ bool OSGPageManager::EndThread()
         while(pagingThread.isRunning())
         {
             std::cout<<"Waiting for TXP pager thread to cancel"<<std::endl;
-            //OpenThreads::Thread::YieldCurrentThread();
-            OpenThreads::Thread::Yield();
+            OpenThreads::Thread::YieldCurrentThread();
         }
        
     }
@@ -279,7 +278,7 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
                 // Now add this tile to the merge list
                 pageManage->AckLoad();
 
-                //OpenThreads::Thread::Yield();
+                //OpenThreads::Thread::YieldCurrentThread();
 
             }
 
@@ -287,7 +286,7 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
         }
         else
         {
-            OpenThreads::Thread::Yield();
+            OpenThreads::Thread::YieldCurrentThread();
         }
             
     } while (!t->testCancel());