diff options
-rw-r--r-- | ACE/ACEXML/common/SAXExceptions.cpp | 1 | ||||
-rw-r--r-- | ACE/tests/Compiler_Features_21_Test.cpp | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 11 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 2 |
6 files changed, 18 insertions, 15 deletions
diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp index 7c9e575e321..e03ef586091 100644 --- a/ACE/ACEXML/common/SAXExceptions.cpp +++ b/ACE/ACEXML/common/SAXExceptions.cpp @@ -111,7 +111,6 @@ ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_C ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void) { - delete[] this->message_; } diff --git a/ACE/tests/Compiler_Features_21_Test.cpp b/ACE/tests/Compiler_Features_21_Test.cpp index 13d3b369614..c8ad796e3a7 100644 --- a/ACE/tests/Compiler_Features_21_Test.cpp +++ b/ACE/tests/Compiler_Features_21_Test.cpp @@ -17,6 +17,7 @@ struct A struct B { B() : b(new A<int>[0]) {} + ~B() { delete [] b; } A<int> *b; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 16a84eebf61..98c3f7bf520 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -651,9 +651,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, - "\n(%P|%t)stream_endpoint_b_ = %s", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()))); + if (TAO_debug_level > 0) + { + CORBA::String_var ep = TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()); + ORBSVCS_DEBUG ((LM_DEBUG, + "\n(%P|%t)stream_endpoint_b_ = <%C>", + ep.in ())); + } + // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 4b09591dea5..882a2d742a3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Endpoint_Strategy.cpp @@ -7,7 +6,6 @@ */ //============================================================================= - #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Endpoint_Strategy.h" @@ -17,8 +15,6 @@ #include "ace/Process_Semaphore.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- @@ -33,7 +29,6 @@ TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) // Destructor. TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) { - } // The base class defines the "failure" case, so that unless the @@ -62,7 +57,6 @@ TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_ -1); } - // ---------------------------------------------------------------------- // TAO_AV_Endpoint_Process_Strategy // ---------------------------------------------------------------------- @@ -339,8 +333,12 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s "(%P|%t) TAO_AV_Endpoint_Process_Strategy: Error in activate ()\n"), -1); - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()))); + if (TAO_debug_level > 0) + { + CORBA::String_var ep = TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()); + ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is: <%C>\n", + ep.in ())); + } stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index 9747d1b82e9..d0c5572b99e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -46,7 +46,7 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) { // Destroy Strategies in the reverse order of creation, they - // refere to each other during destruction and thus need to be + // reference to each other during destruction and thus need to be // cleaned up properly. this->factory_->destroy_supplier_control (this->supplier_control_); this->supplier_control_ = 0; @@ -76,7 +76,7 @@ TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) this->factory_->destroy_dispatching (this->dispatching_); this->dispatching_ = 0; - this->factory (0, 0); + this->factory (0, this->own_factory_); } void diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 4f1d5283b33..6c462bea6fa 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -1450,7 +1450,7 @@ Admin_Client::union_test (void) CORBA::Any_var label = tc->member_label (i); TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0)); - CORBA::ULong val; + CORBA::ULong val = 0; TAO::Any_Impl *impl = label->impl (); TAO_OutputCDR out; |