--- C:/Documents and Settings/pjbu/SIDist/temp/SID48419.tmp	Tue May 12 13:36:17 2009
+++ z:/develop/ecos/packages/kernel/current/src/common/thread.cxx	Tue May 12 13:22:23 2009
@@ -366,7 +366,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::get_current_thread());
     
     // Prevent preemption
     Cyg_Scheduler::lock();
@@ -507,7 +507,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::get_current_thread());
     
     // Prevent preemption
     Cyg_Scheduler::lock();
@@ -538,7 +538,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(WAKE,this,Cyg_Scheduler::get_current_thread());
     
     // Prevent preemption
     Cyg_Scheduler::lock();
@@ -562,7 +562,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(SUSPEND,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(SUSPEND,this,Cyg_Scheduler::get_current_thread());
     
     // Prevent preemption
     Cyg_Scheduler::lock();
@@ -596,7 +596,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(RESUME,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(RESUME,this,Cyg_Scheduler::get_current_thread());
  
     // Prevent preemption
     Cyg_Scheduler::lock();
@@ -636,7 +636,7 @@
 {
     CYG_REPORT_FUNCTION();
 
-    CYG_INSTRUMENT_THREAD(RESUME,this,Cyg_Scheduler::current_thread);
+    CYG_INSTRUMENT_THREAD(RESUME,this,Cyg_Scheduler::get_current_thread());
             
     // Prevent preemption
     Cyg_Scheduler::lock();