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

17 files changed, 45 insertions, 50 deletions

diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 1cd84ba918f..66f34d94cf0 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -129,19 +129,19 @@ JAWS_Synch_IO::transmit_file (const char *filename,
       int iovcnt = 0;
       if (header_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*, header);
+          iov[iovcnt].iov_base = const_cast<char*> (header);
           iov[iovcnt].iov_len =  header_size;
           iovcnt++;
         }
       if (handle.size () > 0)
         {
-          iov[iovcnt].iov_base =  ACE_reinterpret_cast(char*,handle.address ());
+          iov[iovcnt].iov_base =  reinterpret_cast<char*> (handle.address ());
           iov[iovcnt].iov_len = handle.size ();
           iovcnt++;
         }
       if (trailer_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*, trailer);
+          iov[iovcnt].iov_base = const_cast<char*> (trailer);
           iov[iovcnt].iov_len = trailer_size;
           iovcnt++;
         }
diff --git a/apps/JAWS/server/JAWS_Pipeline_Handler.cpp b/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
index da5605558a2..e67a99545bb 100644
--- a/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
+++ b/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
@@ -15,8 +15,7 @@ JAWS_Pipeline_Handler<TYPE>::JAWS_Pipeline_Handler (void)
 template <class TYPE> int
 JAWS_Pipeline_Handler<TYPE>::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  TYPE *data = ACE_dynamic_cast (TYPE *,
-                                 mb->data_block ());
+  TYPE *data = dynamic_cast<TYPE *> (mb->data_block ());
 
   int status = this->handle_input (data, tv);
 
diff --git a/apps/JAWS2/HTTP_10_Parse.cpp b/apps/JAWS2/HTTP_10_Parse.cpp
index a7a028d7454..67e63ae5b2f 100644
--- a/apps/JAWS2/HTTP_10_Parse.cpp
+++ b/apps/JAWS2/HTTP_10_Parse.cpp
@@ -34,7 +34,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
   JAWS_HTTP_10_Request *info;
 
   if (data->payload ())
-    info = ACE_reinterpret_cast (JAWS_HTTP_10_Request *, data->payload ());
+    info = reinterpret_cast<JAWS_HTTP_10_Request *> (data->payload ());
   else
     {
       info = new JAWS_HTTP_10_Request;
@@ -43,7 +43,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
           ACE_ERROR ((LM_ERROR, "%p\n", "JAWS_HTTP_10_Parse_Task::handle_put"));
           return -1;
         }
-      data->payload (ACE_static_cast (void *, info));
+      data->payload (static_cast<void *> (info));
     }
 
   while (info->receive (*(ACE_Message_Block *)data) == 0)
diff --git a/apps/JAWS2/HTTP_10_Write.cpp b/apps/JAWS2/HTTP_10_Write.cpp
index 16bf3f56d9e..d6c81ac665a 100644
--- a/apps/JAWS2/HTTP_10_Write.cpp
+++ b/apps/JAWS2/HTTP_10_Write.cpp
@@ -33,8 +33,7 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
 
   JAWS_IO *io = policy->io ();
 
-  JAWS_HTTP_10_Request *info = ACE_static_cast (JAWS_HTTP_10_Request *,
-                                                data->payload ());
+  JAWS_HTTP_10_Request *info = static_cast<JAWS_HTTP_10_Request *> (data->payload ());
 
   if (info->status () == (int) JAWS_HTTP_10_Request::STATUS_QUIT)
     {
diff --git a/apps/JAWS2/JAWS/Assoc_Array.cpp b/apps/JAWS2/JAWS/Assoc_Array.cpp
index 16781be98f4..841aa042928 100644
--- a/apps/JAWS2/JAWS/Assoc_Array.cpp
+++ b/apps/JAWS2/JAWS/Assoc_Array.cpp
@@ -21,14 +21,14 @@ JAWS_Assoc_Array<KEY,DATA>::JAWS_Assoc_Array (int maxsize)
 {
   typedef void * ptr_type;
 
-  this->k_array_ = ACE_reinterpret_cast(KEY **, new ptr_type[this->maxsize_]);
+  this->k_array_ = reinterpret_cast<KEY **> (new ptr_type[this->maxsize_]);
   if (this->k_array_ == 0)
     {
       this->maxsize_ = 0;
       return;
     }
 
-  this->d_array_ = ACE_reinterpret_cast(DATA **, new ptr_type[this->maxsize_]);
+  this->d_array_ = reinterpret_cast<DATA **> (new ptr_type[this->maxsize_]);
   if (this->d_array_ == 0)
     {
       delete[] this->k_array_;
@@ -48,8 +48,8 @@ JAWS_Assoc_Array<KEY,DATA>::~JAWS_Assoc_Array (void)
 {
   this->clear ();
 
-  delete[] ACE_reinterpret_cast(void **, this->k_array_);
-  delete[] ACE_reinterpret_cast(void **, this->d_array_);
+  delete[] reinterpret_cast<void **> (this->k_array_);
+  delete[] reinterpret_cast<void **> (this->d_array_);
 
   this->k_array_ = 0;
   this->d_array_ = 0;
diff --git a/apps/JAWS2/JAWS/Concurrency.cpp b/apps/JAWS2/JAWS/Concurrency.cpp
index 26670687799..63cb147e875 100644
--- a/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/apps/JAWS2/JAWS/Concurrency.cpp
@@ -75,7 +75,7 @@ JAWS_Concurrency_Base::svc (void)
       return -1;
     }
 
-  db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  db = dynamic_cast<JAWS_Data_Block *> (mb);
 
   this->svc_loop (db);
 
diff --git a/apps/JAWS2/JAWS/IO.cpp b/apps/JAWS2/JAWS/IO.cpp
index 1cb294f96fb..83efad2f4bb 100644
--- a/apps/JAWS2/JAWS/IO.cpp
+++ b/apps/JAWS2/JAWS/IO.cpp
@@ -240,7 +240,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
       int iovcnt = 0;
       if (header_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*,header);
+          iov[iovcnt].iov_base = const_cast<char*> (header);
           iov[iovcnt].iov_len =  header_size;
           iovcnt++;
         }
@@ -255,7 +255,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
         }
       if (trailer_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*,trailer);
+          iov[iovcnt].iov_base = const_cast<char*> (trailer);
           iov[iovcnt].iov_len = trailer_size;
           iovcnt++;
         }
@@ -344,7 +344,7 @@ JAWS_Asynch_IO::accept (JAWS_IO_Handler *ioh,
   //ACE_HANDLE listen_handle = db->policy ()->acceptor ()->get_handle ();
 
   //JAWS_Asynch_IO_Handler *aioh =
-  //  ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+  //  dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   size_t bytes_to_read = JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE;
 
@@ -362,7 +362,7 @@ JAWS_Asynch_IO::read (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Read_Stream ar;
 
@@ -383,7 +383,7 @@ JAWS_Asynch_IO::receive_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Message_Block *mb = 0;
   ACE_Filecache_Handle *handle;
@@ -439,7 +439,7 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
 
@@ -493,7 +493,7 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
   JAWS_Cached_FILE *cf = new JAWS_Cached_FILE (filename);
@@ -554,7 +554,7 @@ JAWS_Asynch_IO::send_message (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Message_Block *mb;
   ACE_NEW (mb, ACE_Message_Block (buffer, length));
diff --git a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index 8af617d8979..0616e600800 100644
--- a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -23,7 +23,7 @@ JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler (void)
 int
 JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  JAWS_Data_Block *db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *db = dynamic_cast<JAWS_Data_Block *> (mb);
   JAWS_IO_Handler *ioh = db->io_handler ();
 
   // guarantee the handler remains for the duration of this call
@@ -35,7 +35,7 @@ JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
     {
       JAWS_Pipeline_Handler *task = ioh->task ();
       JAWS_Pipeline_Handler *next
-        = ACE_dynamic_cast (JAWS_Pipeline_Handler *, task->next ());
+        = dynamic_cast<JAWS_Pipeline_Handler *> (task->next ());
 
       ioh->task (next);
     }
@@ -60,11 +60,11 @@ JAWS_Pipeline_Handler::policy (JAWS_Dispatch_Policy *policy)
 int
 JAWS_Pipeline_Accept_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  JAWS_Data_Block *db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *db = dynamic_cast<JAWS_Data_Block *> (mb);
 
   JAWS_Pipeline_Handler *task = db->task ();
   JAWS_Pipeline_Handler *next
-    = ACE_dynamic_cast (JAWS_Pipeline_Handler *, task->next ());
+    = dynamic_cast<JAWS_Pipeline_Handler *> (task->next ());
 
   JAWS_IO_Handler *ioh = this->new_handler (db);
   if (ioh == 0)
@@ -178,7 +178,7 @@ JAWS_Pipeline_Done_Task::put (ACE_Message_Block *mb, ACE_Time_Value *)
 {
   JAWS_TRACE ("JAWS_Pipeline_Done_Task::put");
 
-  JAWS_Data_Block *data = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *data = dynamic_cast<JAWS_Data_Block *> (mb);
 
   JAWS_IO_Handler *handler = data->io_handler ();
   JAWS_Dispatch_Policy *policy = this->policy ();
diff --git a/apps/JAWS3/http/HTTP_States.h b/apps/JAWS3/http/HTTP_States.h
index 12d8922d50a..cabfcf8cb62 100644
--- a/apps/JAWS3/http/HTTP_States.h
+++ b/apps/JAWS3/http/HTTP_States.h
@@ -32,7 +32,7 @@ private:                                                         \
                                                                  \
   int service (JAWS_Event_Completer *ec, void *d)                \
   {                                                              \
-    JAWS_HTTP_Data *hd = ACE_static_cast (JAWS_HTTP_Data *, d);  \
+    JAWS_HTTP_Data *hd = static_cast<JAWS_HTTP_Data *> (d);  \
     return this->service (ec, hd);                               \
   }                                                              \
                                                                  \
@@ -41,7 +41,7 @@ private:                                                         \
                                    , void a*                     \
                                    )                             \
   {                                                              \
-    JAWS_HTTP_Data *hd = ACE_static_cast (JAWS_HTTP_Data *, d);  \
+    JAWS_HTTP_Data *hd = static_cast<JAWS_HTTP_Data *> (d);  \
     return this->transition (r, hd, a);                          \
   }                                                              \
                                                                  \
diff --git a/apps/JAWS3/jaws3/Asynch_IO.cpp b/apps/JAWS3/jaws3/Asynch_IO.cpp
index 811c3d88a6f..0113e73da39 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -139,7 +139,7 @@ JAWS_EC_AH_Adapter
                                    );
   // More useful diagnostics not implemented yet.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->input_complete (io_result, act);
   delete this;
@@ -157,7 +157,7 @@ JAWS_EC_AH_Adapter
                                    );
   // More useful diagnostics not implemented yet.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->output_complete (io_result, act);
   delete this;
@@ -176,7 +176,7 @@ JAWS_EC_AH_Adapter
   // More useful diagnostics not implemented yet.
   // Watch out for files not opened in overlapped IO mode.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->output_complete (io_result, act);
   delete this;
diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp
index 3352d8d9a92..970529a59d3 100644
--- a/apps/drwho/CM_Client.cpp
+++ b/apps/drwho/CM_Client.cpp
@@ -58,8 +58,7 @@ CM_Client::receive (int timeout)
                                     this->recv_packet_,
                                     UDP_PACKET_SIZE,
                                     0,
-                                    ACE_reinterpret_cast (sockaddr *,
-                                                          &this->sin_),
+                                    reinterpret_cast<sockaddr *> (&this->sin_),
                                     &sin_len);
           if (n < 0)
             return -1;
@@ -122,7 +121,7 @@ CM_Client::send (void)
                   this->send_packet_,
                   packet_length,
                   0,
-                  ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                  reinterpret_cast<sockaddr *> (&this->sin_),
                   sizeof this->sin_) < 0)
         return -1;
     }
diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp
index 16a7bcfe07b..96d5385c790 100644
--- a/apps/drwho/CM_Server.cpp
+++ b/apps/drwho/CM_Server.cpp
@@ -28,7 +28,7 @@ CM_Server::open (short port_number)
 
   // This call fails if an rflo daemon is already running.
   if (ACE_OS::bind (this->sokfd_,
-                    ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                    reinterpret_cast<sockaddr *> (&this->sin_),
                     sizeof this->sin_) < 0)
     return -1;
 
@@ -54,7 +54,7 @@ CM_Server::receive (int)
                             this->recv_packet_,
                             UDP_PACKET_SIZE,
                             0,
-                            ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                            reinterpret_cast<sockaddr *> (&this->sin_),
                             (int *) &sin_len);
   if (n == -1)
     return -1;
@@ -88,7 +88,7 @@ CM_Server::send (void)
               this->send_packet_,
               packet_length,
               0,
-              ACE_reinterpret_cast (sockaddr *, &this->sin_),
+              reinterpret_cast<sockaddr *> (&this->sin_),
               sizeof this->sin_) < 0)
     return -1;
 
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index f7115c4fe97..aa4bea1349b 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -61,7 +61,7 @@ started_by_inetd (void)
   int size = sizeof sin;
 
   return ACE_OS::getsockname (0,
-                              ACE_reinterpret_cast (sockaddr *, &sin),
+                              reinterpret_cast<sockaddr *> (&sin),
                               &size) == 0;
 }
 
diff --git a/apps/gperf/src/Hash_Table.cpp b/apps/gperf/src/Hash_Table.cpp
index ecd56920d10..43c72552cee 100644
--- a/apps/gperf/src/Hash_Table.cpp
+++ b/apps/gperf/src/Hash_Table.cpp
@@ -67,7 +67,7 @@ Hash_Table::~Hash_Table (void)
                   keysig_width,
                   "keysig"));
 
-      for (int i = ACE_static_cast (int, this->size_ - 1); i >= 0; i--)
+      for (int i = static_cast<int> (this->size_ - 1); i >= 0; i--)
         if (this->table_[i])
           ACE_DEBUG ((LM_DEBUG,
                       "%8d, %*s, %s\n",
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index dceb489f28b..68e6855ffe6 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -252,8 +252,7 @@ Key_List::read_keys (void)
           const char *delimiter = option.delimiter ();
           ACE_NEW_RETURN (this->head,
                           List_Node (buffer,
-                                     ACE_static_cast (int,
-                                       ACE_OS::strcspn (buffer,
+                                     static_cast<int> (ACE_OS::strcspn (buffer,
                                                         delimiter))),
                           -1);
           for (temp = this->head;
@@ -263,8 +262,7 @@ Key_List::read_keys (void)
             {
               ACE_NEW_RETURN (temp->next,
                               List_Node (buffer,
-                                         ACE_static_cast (int,
-                                           ACE_OS::strcspn (buffer,
+                                         static_cast<int> (ACE_OS::strcspn (buffer,
                                                             delimiter))),
                               -1);
               this->total_keys++;
@@ -1867,7 +1865,7 @@ Key_List::dump (void)
 
   u_int keysig_width = option.max_keysig_size () > ACE_OS::strlen ("keysig")
     ? option.max_keysig_size ()
-    : ACE_static_cast (u_int, ACE_OS::strlen ("keysig"));
+    : static_cast<u_int> (ACE_OS::strlen ("keysig"));
 
   size_t key_length = this->max_key_length ();
   size_t keyword_width = key_length > ACE_OS::strlen ("keysig")
diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp
index b5e22bc0bb9..ec71e81abce 100644
--- a/apps/gperf/src/List_Node.cpp
+++ b/apps/gperf/src/List_Node.cpp
@@ -69,7 +69,7 @@ List_Node::List_Node (char *k, int len)
   : link (0),
     next (0),
     key (k),
-    rest (option[TYPE] ? k + len + 1 : ACE_const_cast(char*, "")),
+    rest (option[TYPE] ? k + len + 1 : const_cast<char*> ("")),
     length (len),
     slot (0)
 {
diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp
index 321bb694b1d..9134375d72c 100644
--- a/apps/mkcsregdb/mkcsregdb.cpp
+++ b/apps/mkcsregdb/mkcsregdb.cpp
@@ -151,8 +151,8 @@ csdb_generator::read_from (const char *srcfile)
       if (entry_.max_bytes_ == 0)
         fail ("entry does not define max_bytes");
       write_entry ();
-      delete [] ACE_const_cast (char *, entry_.desc_);
-      delete [] ACE_const_cast (char *, entry_.loc_name_);
+      delete [] const_cast<char *> (entry_.desc_);
+      delete [] const_cast<char *> (entry_.loc_name_);
       count_++;
       in_entry_ = 0;
       break;
@@ -185,7 +185,7 @@ csdb_generator::read_from (const char *srcfile)
         if (*ptr == ':')
           ptr++;
         ACE_CDR::UShort tmp =
-          ACE_static_cast(ACE_CDR::UShort,strtoul(ptr,&ptr,16));
+          static_cast<ACE_CDR::UShort> (strtoul(ptr,&ptr,16));
         if (*ptr != 0 && *ptr != ':')
           {
             char *emsg = new char [100];
@@ -207,7 +207,7 @@ csdb_generator::read_from (const char *srcfile)
       if (entry_.max_bytes_ != 0)
         fail ("duplicate max_bytes");
       entry_.max_bytes_ =
-        ACE_static_cast (ACE_CDR::UShort, strtol(line_data_,&ptr,10));
+        static_cast<ACE_CDR::UShort> (strtol(line_data_,&ptr,10));
       if (*ptr != 0)
         fail ("invalid max_bytes");
       break;