ChangeLogTag:Thu Jan 20 18:18:00 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

8 files changed, 12 insertions, 15 deletions

diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
index 745b744129c..d6911908658 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
@@ -31,7 +31,7 @@ do_child (ACE_FIFO_Recv &fifo_reader)
     return -1;
 
   char *argv[2];
-  argv[0] = ACE_const_cast (char *, EXEC_COMMAND_ARG);
+  argv[0] = const_cast<char *> (EXEC_COMMAND_ARG);
   argv[1] = 0;
 
   if (ACE_OS::execvp (EXEC_NAME, argv) == -1)
diff --git a/examples/IPC_SAP/FILE_SAP/client.cpp b/examples/IPC_SAP/FILE_SAP/client.cpp
index 531ef6a62c4..f26302f3b57 100644
--- a/examples/IPC_SAP/FILE_SAP/client.cpp
+++ b/examples/IPC_SAP/FILE_SAP/client.cpp
@@ -52,7 +52,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else
     ACE_OS::printf ("fileinfo : mode = %o\nno of links = %lu\nsize = %lu\n",
                     (u_int) fileinfo.mode_ & 0777,
-                    ACE_static_cast(u_long ,fileinfo.nlink_),
+                    static_cast<u_long > (fileinfo.nlink_),
                     (u_long) fileinfo.size_);
 
   off_t fpos = cli_file.tell ();
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index 724491fdb0a..e4cf8997857 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -60,7 +60,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // Establish connection with remote server.
   if (ACE_OS::connect (s_handle,
-		       ACE_reinterpret_cast(sockaddr *, &saddr),
+		       reinterpret_cast<sockaddr *> (&saddr),
                        sizeof saddr) == -1)
     ACE_OS::perror (ACE_TEXT("connect")), ACE_OS::exit (1);
 
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
index 3273a306cdc..0a6915cc463 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
@@ -50,7 +50,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   /* Associate address with endpoint */
   if (ACE_OS::bind (s_handle,
-                    ACE_reinterpret_cast(struct sockaddr *, &saddr),
+                    reinterpret_cast<struct sockaddr *> (&saddr),
                     sizeof saddr) == -1)
     ACE_OS::perror (ACE_TEXT("bind")), ACE_OS::exit (1);
 
@@ -72,8 +72,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       do
         n_handle =
           ACE_OS::accept (s_handle,
-                          ACE_reinterpret_cast(struct sockaddr *,
-                                               &cli_addr),
+                          reinterpret_cast<struct sockaddr *> (&cli_addr),
                           &cli_addr_len);
       while (n_handle == ACE_INVALID_HANDLE && errno == EINTR);
 
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 0f112652030..f681defd2f9 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -275,7 +275,7 @@ Options::oneway_client_test (void *)
   cli_stream.close ();
 
   delete [] request;
-  return ACE_reinterpret_cast (void *, result);
+  return reinterpret_cast<void *> (result);
 }
 
 // Static function entry point to the twoway client service.
@@ -366,7 +366,7 @@ Options::twoway_client_test (void *)
   cli_stream.close ();
 
   delete [] request;
-  return ACE_reinterpret_cast (void *, result);
+  return reinterpret_cast<void *> (result);
 }
 
 ACE_THR_FUNC
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
index 71b568fd9cc..b978bb5f989 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
@@ -25,14 +25,13 @@ 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 *,
-                                                                  handle),
+                                              reinterpret_cast<void *> (handle),
                                               THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) %p\n",
                 "spawn"));
 #else
-  (*server) (ACE_reinterpret_cast(void *, handle));
+  (*server) (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 5d446b444c5..cddfe787d92 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -131,15 +131,14 @@ run_event_loop (const ACE_TCHAR rendezvous[])
 
 #if defined (ACE_HAS_THREADS)
       if (ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) server,
-                                                  ACE_reinterpret_cast (void *,
-                                                      new_stream.get_handle ()),
+                                                  reinterpret_cast<void *> (new_stream.get_handle ()),
                                                   THR_DETACHED) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("spawn")),
                           1);
 #else
-      server (ACE_reinterpret_cast (void *, new_stream.get_handle ()));
+      server (reinterpret_cast<void *> (new_stream.get_handle ()));
 #endif /* ACE_HAS_THREADS */
     }
 
diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
index 551627e3bc6..b629b9f0dd8 100644
--- a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
@@ -37,7 +37,7 @@ handle_client (ACE_LSOCK_Stream &stream)
        )
     ACE_DEBUG ((LM_DEBUG, "%*s", n, buf));
 
-  ACE_OS::sprintf (buf, "%d", ACE_static_cast (int, ACE_OS::getpid ()));
+  ACE_OS::sprintf (buf, "%d", static_cast<int> (ACE_OS::getpid ()));
 
   ACE_DEBUG ((LM_DEBUG, "(%s, %d) ----------------------------------------\n", buf, ACE_OS::strlen (buf)));