Thu Mar 1 19:36:47 UTC 2007 Wallace Zhang <zhang_w@ociweb.com>

3 files changed, 8 insertions, 13 deletions

diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 29df64e02b4..37fc50aca96 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -196,7 +196,7 @@ TAO_AMH_DSI_Exception_Holder_out &
 TAO_AMH_DSI_Exception_Holder_out::operator= (
     const TAO_AMH_DSI_Exception_Holder_out &p)
 {
-  this->ptr_ = ACE_const_cast (TAO_AMH_DSI_Exception_Holder_out &, p).ptr_;
+  this->ptr_ = const_cast<TAO_AMH_DSI_Exception_Holder_out &> (p).ptr_;
   return *this;
 }
 
@@ -344,10 +344,9 @@ TAO_AMH_DSI_Response_Handler::invoke_reply (CORBA::NVList_ptr args,
       }
     this->_tao_rh_send_reply ();
   }
-  catch (const CORBA::Exception & ex)
+  catch (const CORBA::Exception &)
     {
       // TODO:
-      ACE_UNUSED_ARG (ex);
     }
 }
 
@@ -401,10 +400,9 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
       //  this->sent_gateway_exception_ = 1;
       this->_tao_rh_send_reply ();
     }
-  catch (const CORBA::Exception & ex)
+  catch (const CORBA::Exception &)
     {
       // TODO:
-      ACE_UNUSED_ARG (ex);
     }
 
 }
@@ -447,9 +445,9 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
   //  this->sent_gateway_exception_ = 1;
     this->_tao_rh_send_reply ();
   }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception &)
   {
-    ACE_UNUSED_ARG (ex);
+    // TODO:
   }
 
 }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
index 7f25dc6ef18..04141b76813 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -21,7 +21,7 @@ ACE_RCSID(DynamicInterface, Request, "$Id$")
 TAO_DII_Reply_Handler_ptr
 TAO_DII_Reply_Handler::_nil (void)
 {
-  return (TAO_DII_Reply_Handler_ptr)0;
+  return static_cast<TAO_DII_Reply_Handler_ptr> (0);
 }
 
 // DII Request class implementation
@@ -47,6 +47,6 @@ TAO_DII_Reply_Handler::_unchecked_narrow (CORBA::Object_ptr obj)
     return TAO_DII_Reply_Handler::_nil ();
 
   return
-    ACE_reinterpret_cast (TAO_DII_Reply_Handler_ptr,
-                            &TAO_DII_Reply_Handler::_tao_class_id);
+    reinterpret_cast<TAO_DII_Reply_Handler_ptr>
+                         (&TAO_DII_Reply_Handler::_tao_class_id);
 }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
index d470fbabf39..f1811b6441d 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -89,11 +89,8 @@ public:
 
   static int _tao_class_id;
 
-  /// Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef TAO_DII_Reply_Handler_ptr _ptr_type;
   typedef TAO_DII_Reply_Handler_var _var_type;
-#endif /* __GNUC__ */
 
 };