yow

5 files changed, 9 insertions, 7 deletions

diff --git a/examples/Misc/test_XtReactor1.cpp b/examples/Misc/test_XtReactor1.cpp
index 8669dfb0653..723726bb5b0 100644
--- a/examples/Misc/test_XtReactor1.cpp
+++ b/examples/Misc/test_XtReactor1.cpp
@@ -8,6 +8,7 @@
 #include "ace/Message_Block.h"
 
 #if defined (ACE_HAS_XT)
+#define String XtString
 #include <Xm/PushB.h>
 
 class Stdout : public ACE_Event_Handler
diff --git a/examples/Misc/test_XtReactor2.cpp b/examples/Misc/test_XtReactor2.cpp
index 679ea81b758..b43f1eca4f2 100644
--- a/examples/Misc/test_XtReactor2.cpp
+++ b/examples/Misc/test_XtReactor2.cpp
@@ -8,6 +8,7 @@
 #include "ace/Message_Block.h"
 
 #if defined (ACE_HAS_XT)
+#define String XtString
 #include <Xm/PushB.h>
 
 class Stdin : public ACE_Event_Handler
@@ -44,8 +45,8 @@ int main (int argc, char**argv)
   XtManageChild (button);
   XtAddCallback (button, XmNactivateCallback, ActivateCB, NULL);
 
-  // A reactor beastie
-  XtReactor reactor (XtWidgetToApplicationContext (top_level));
+  // A reactor beastie.
+  ACE_XtReactor reactor (XtWidgetToApplicationContext (top_level));
 
   // Print a message when data is recv'd on stdin...
   ACE_Event_Handler * stdin_ = new Stdin;
diff --git a/examples/Service_Configurator/IPC-tests/server/server_test.cpp b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
index 451f178e256..8e375021959 100644
--- a/examples/Service_Configurator/IPC-tests/server/server_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
@@ -13,10 +13,10 @@ main (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server_test.open"), -1);
 
   // Create an adapter to end the event loop.
-  ACE_Sig_Adapter sa (ACE_Sig_Handler_Ex (ACE_Service_Config::end_reactor_event_loop));
+  ACE_Sig_Adapter sa ((ACE_Sig_Handler_Ex) ACE_Service_Config::end_reactor_event_loop);
 
   // Register a signal handler.
-  ACE_Service_Config::reactor ()->register_handler (SIGINT, sa);
+  ACE_Service_Config::reactor ()->register_handler (SIGINT, &sa);
 
   // Run forever, performing the configured services until we are shut
   // down by a SIGINT/SIGQUIT signal.
diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp
index 78e9a006321..aedea6fc158 100644
--- a/examples/Threads/test_task_three.cpp
+++ b/examples/Threads/test_task_three.cpp
@@ -103,7 +103,7 @@ Test_Task::svc (void)
 
   for (int index = 0; index < NUM_INVOCATIONS; index++)
     {
-      ACE_OS::thr_extern "C" yield ();
+      ACE_OS::thr_yield ();
 
       if (r_->notify (this, ACE_Event_Handler::READ_MASK))
 	{
@@ -181,7 +181,7 @@ main (int argc, char **argv)
     }
 
   // Register a signal handler.
-  ACE_Sig_Action sa (ACE_Sig_Handler_Ex (handler), SIGINT);
+  ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT);
 
   ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
   ACE_Reactor *reactor2 = new ACE_Reactor ();
diff --git a/examples/Threads/test_thread_manager.cpp b/examples/Threads/test_thread_manager.cpp
index a09db55dd51..73029d70d88 100644
--- a/examples/Threads/test_thread_manager.cpp
+++ b/examples/Threads/test_thread_manager.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   daemon.open (argv[0]);
 
   // Register a signal handler.
-  ACE_Sig_Action sa (ACE_Sig_Handler_Ex (handler), SIGINT);
+  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
 
   int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
   int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;