ChangeLogTag: Fri Jun 15 17:40:51 2001 Krishnakumar B <kitty@cs.wustl.edu>

3 files changed, 5 insertions, 5 deletions

diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
index 80e0f9961b8..d0179bbc477 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
@@ -23,14 +23,14 @@ run_server (ACE_THR_FUNC server,
   // Spawn a new thread and run the new connection in that thread of
   // control using the <server> function as the entry point.
   if (ACE_Thread_Manager::instance ()->spawn (server,
-                                              ACE_reinterpret_cast(void *, 
+                                              ACE_reinterpret_cast(void *,
                                                                   handle),
                                               THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) %p\n",
                 "spawn"));
 #else
-  (*server) ((void *) handle);
+  (*server) (ACE_reinterpret_cast(void *, handle));
 #endif /* ACE_HAS_THREADS */
 }
 
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
index 34c156d37b6..2e136782c21 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -137,7 +137,7 @@ run_event_loop (const char rendezvous[])
                            "spawn"),
                           1);
 #else
-      server ((void *) new_stream.get_handle ());
+      server (ACE_reinterpret_cast (void *, new_stream.get_handle ()));
 #endif /* ACE_HAS_THREADS */
     }
 
diff --git a/examples/Shared_Malloc/Malloc.cpp b/examples/Shared_Malloc/Malloc.cpp
index b6602755983..7c88085c5a1 100644
--- a/examples/Shared_Malloc/Malloc.cpp
+++ b/examples/Shared_Malloc/Malloc.cpp
@@ -69,10 +69,10 @@ template class ACE_Allocator_Adapter<ST_ALLOCATOR>;
 
 template class ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex>;
 template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>;
-#if !defined (ACE_HAS_THREADS)
+#if !defined (ACE_HAS_THREADS) && !defined(ACE_HAS_STD_TEMPLATE_SPECIALIZATION)
 template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
 template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-#endif /* ! ACE_HAS_THREADS */
+#endif /* ! ACE_HAS_THREADS && ! ACE_HAS_STD_TEMPLATE_SPECIALIZATION */
 
 #if defined (ACE_LACKS_SYSV_SHMEM)