1 files changed, 5 insertions, 5 deletions

diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index bf301d061fe..bcc7fd908dd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -29,7 +29,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       if (current_iov_len <= max_length)
         {
           // Return the full data portion.
-          block.iov_len = ACE_static_cast (u_long, current_iov_len);
+          block.iov_len = static_cast<u_long>(current_iov_len);
           block.iov_base = this->iov_[this->iov_index_].iov_base;
 
           // Go to the next block.
@@ -41,14 +41,14 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
         {
           // Let the caller use the first part of this
           // message block.
-          block.iov_len = ACE_static_cast (u_long, max_length);
+          block.iov_len = static_cast<u_long>(max_length);
           block.iov_base = this->iov_[this->iov_index_].iov_base;
 
           // Break up the block.
           this->iov_len_left_ = current_iov_len - max_length;
           this->iov_ptr_ =
             ACE_reinterpret_cast (char *,
-                                  ACE_reinterpret_cast (char *, block.iov_base)
+                                  reinterpret_cast<char *>(block.iov_base)
                                   + max_length);
           this->state_ = INTRA_BLOCK;
 
@@ -61,7 +61,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       if (this->iov_len_left_ <= max_length)
         {
           // Return everything that's left in the block.
-          block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
+          block.iov_len = static_cast<u_long>(this->iov_len_left_);
           block.iov_base = this->iov_ptr_;
 
           // Go to the next block.
@@ -75,7 +75,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       else
         {
           // Split a little more off the block.
-          block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
+          block.iov_len = static_cast<u_long>(this->iov_len_left_);
           block.iov_base = this->iov_ptr_;
 
           this->iov_len_left_ -= max_length;