diff options
| -rw-r--r-- | ACE/ace/INET_Addr.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/DII_Arguments.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Server_Request.cpp | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index bebc484f834..70eedf9f954 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -479,7 +479,6 @@ static int get_port_number_from_name (const char port_name[], } // We try to resolve port number from its name. - #if defined (ACE_LACKS_GETSERVBYNAME) port_number = 0; ACE_UNUSED_ARG (port_name); diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 2b421eb3c91..bd5ebe7efa6 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -411,7 +411,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply ( this->_tao_out.write_char_array (encap.buffer (), ACE_Utils::truncate_cast<ACE_CDR::ULong> (encap.length ())); // This will prevent the marshaling of any parameters into this reply. - // this->sent_gateway_exception_ = 1; + // this->sent_gateway_exception_ = true; this->_tao_rh_send_reply (); } catch (const CORBA::Exception &) @@ -456,7 +456,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply ( // to the original source of the reply. this->_tao_out.write_octet_array_mb (encap.start()); // This will prevent the marshaling of any parameters into this reply. - // this->sent_gateway_exception_ = 1; + // this->sent_gateway_exception_ = true; this->_tao_rh_send_reply (); } catch (const CORBA::Exception &) @@ -484,7 +484,7 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj) if (CORBA::is_nil (obj)) return TAO_AMH_DSI_Response_Handler::_nil (); - return dynamic_cast < TAO_AMH_DSI_Response_Handler_ptr > (obj); + return dynamic_cast <TAO_AMH_DSI_Response_Handler_ptr> (obj); } const char* diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index d95e1c7ab1b..7ca4ea488b9 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -59,7 +59,6 @@ namespace TAO CORBA::Boolean NVList_Argument::demarshal (TAO_InputCDR &cdr) { - try { // Now, get all the "return", "out", and "inout" parameters diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index e946d3179b8..6c4fcd680da 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -37,7 +37,7 @@ CORBA::ServerRequest::_decr_refcount (void) } CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request) - : lazy_evaluation_ (0), + : lazy_evaluation_ (false), ctx_ (CORBA::Context::_nil ()), params_ (CORBA::NVList::_nil ()), retval_ (0), |