diff options
author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:19:28 +0200 |
---|---|---|
committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:19:28 +0200 |
commit | 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0 (patch) | |
tree | 175e6d1a044c3603940b52ac8d085fc25548382f /TAO/orbsvcs | |
parent | ab436d45dc956c1eaec31bff0c43ca3a0cb0cb66 (diff) | |
download | ATCD-60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0.tar.gz |
Remove leading blank lines after opening {
Diffstat (limited to 'TAO/orbsvcs')
302 files changed, 0 insertions, 454 deletions
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index 33d2946cabe..0c2e1f49dd9 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -140,13 +140,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending of events.\n"; while (1) { - consumer->push (event); ACE_Time_Value tv(0, 1000 * EVENT_DELAY_MS); orb->run(tv); if ((remote_ecname != 0) && (!gateway_initialized)) { - try { // Get the remote event channel object CORBA::Object_var obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (remote_ecname)); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp index bc04b0e8996..1f892b0062b 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp @@ -91,7 +91,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending events.\n"; while (1) { - event[0].header.type++; if (event[0].header.type > MY_EVENT_END) { event[0].header.type = MY_EVENT_START; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp index 45ddebdb3a4..af651e069a4 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp @@ -14,7 +14,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) // Override the disconnect_push_Supplier() operation. void EchoEventSupplier_i::disconnect_push_supplier() { - // Deactivate this object. CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp index b86312d4220..7fc342c949b 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp @@ -37,7 +37,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) PortableServer::POA_ptr createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy(PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp index 9436c6ad8e6..e474955373f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp index 9a758e812a6..57bbf13048a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp @@ -19,7 +19,6 @@ void MessengerTask::end() int MessengerTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index b6e3c7877e1..7a21c088df0 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -12,7 +12,6 @@ EventSequenceConsumer_i::push_structured_events ( const CosNotification::EventBatch& events ) { - std::cout << "events received " << std::endl; const char* value = 0; @@ -28,7 +27,6 @@ EventSequenceConsumer_i::push_structured_events ( void EventSequenceConsumer_i::disconnect_sequence_push_consumer () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index e15da52477c..697d711ff81 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -9,7 +9,6 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb) void EventSequenceSupplier_i::disconnect_sequence_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index fc0488c9107..d457dc3f4b1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , supplier_(new EventSequenceSupplier_i(orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp index 10a9e283676..9281d04ca16 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp @@ -112,14 +112,12 @@ CORBA::Boolean Messenger_i::send_message ( char *& message ) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 69b8b1bc3b1..73572e2fd88 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -27,7 +26,6 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index ab5ad740764..932640f7adf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index bdbdc2eb77a..87fc10aa190 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp index d9fb63f56d8..a8a88595673 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp @@ -115,7 +115,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index 81b6de4c263..0ec2cb4cc1e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -26,7 +25,6 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 30701f30fbd..f7e401db29f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp index f053d4af659..5c46a1cf215 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp @@ -97,7 +97,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index 24dd322ed0d..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,7 +26,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index 03dbefa4624..75ebbf9449a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index 24dd322ed0d..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,7 +26,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 159d860a26d..4f5d0f097ea 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index ea1a56d9e66..6ce7ae7e307 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -127,7 +127,6 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index 9858d2f7ba8..1218fb6a243 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -11,7 +11,6 @@ void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -25,7 +24,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index a4f57a40858..e75774d4483 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h index f3ec546e4b4..17440a354b4 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp index a7e2813c2d2..a0046a31b21 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp @@ -66,7 +66,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp index 4358936462e..762ab74551e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp @@ -37,7 +37,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); if (parse_args (argc, argv) != 0) diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index c3a3b8d849d..540925e5f4d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -120,7 +120,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index 6c9b04a9836..ca97ea5c3bb 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -155,7 +155,6 @@ public: }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; try { diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index a0c3b4f94aa..00414059517 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -185,12 +185,10 @@ public: }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; int pay_size = 1; try { - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); if (parse_args (ac, av) != 0) diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index aeb2d6bfb1c..eaad5ff3dc1 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -21,13 +21,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) { - ORBSVCS_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); FILE* file = 0; char *id_str=0, *prog=0; try{ - file = ACE_OS::fopen(conf_file, "r"); if (file == 0) throw PortableGroup::NoFactory(); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 0b56d2aede3..654199c17e3 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -50,7 +50,6 @@ int parse_args(int argc, ACE_TCHAR* argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try{ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 901816581ff..75c6833693b 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h @@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * Default fault analyzer. * @@ -38,7 +37,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_DefaultFaultAnalyzer : public ::TAO::FT_FaultAnalyzer { - public: /** * Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index b4aa54eb188..882af564e02 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -33,7 +33,6 @@ namespace TAO */ class TAO_ReplicationManagerLib_Export FT_FaultAnalyzer { - public: /** * Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index f01bf130997..2f7b9c0cfd5 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -54,7 +54,6 @@ int TAO::FT_FaultConsumer::init ( FT::FaultNotifier_ptr fault_notifier, TAO::FT_FaultAnalyzer * fault_analyzer) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -116,7 +115,6 @@ int TAO::FT_FaultConsumer::init ( */ int TAO::FT_FaultConsumer::fini (void) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -130,7 +128,6 @@ int TAO::FT_FaultConsumer::fini (void) { if (!CORBA::is_nil (this->fault_notifier_.in())) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 749409d43ab..f593e804845 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_FaultAnalyzer; @@ -40,7 +39,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_FaultConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer { - ////////////////////// // non-CORBA interface @@ -97,7 +95,6 @@ namespace TAO * interface. */ //@{ - //////////////// // CORBA methods virtual void push_structured_event ( diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 270584224fd..4743da70d72 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -487,7 +487,6 @@ void TAO::FT_ReplicationManager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -543,7 +542,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -591,7 +589,6 @@ TAO::FT_ReplicationManager::set_primary_member ( TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { - PortableGroup::TagGroupTaggedComponent tag_component; TAO_FT_IOGR_Property prop (tag_component); @@ -894,7 +891,6 @@ void TAO::FT_ReplicationManager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index da4c8d6809f..1f4b4fdbff4 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -148,7 +148,6 @@ namespace TAO * Methods required by the POA_FT::ReplicationManager interface. */ //@{ - /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( FT::FaultNotifier_ptr fault_notifier); @@ -171,7 +170,6 @@ namespace TAO * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -233,7 +231,6 @@ namespace TAO * interface. */ //@{ - /// Create a member in an object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, @@ -311,7 +308,6 @@ namespace TAO * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index a5ae04091f5..4c8faf71294 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -366,7 +366,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( const PortableGroup::Location & location, int & object_is_primary) { - // To determine if this was a primary that faulted: // Get the TagFTGroupTaggedComponent from the IOGR and search // for the primary, using the TAO_FT_IOGR_Property helper class. @@ -669,7 +668,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if ((result == 0) && (fault_event_desc.membership_style == FT::MEMB_INF_CTRL)) { - PortableGroup::ObjectGroup_var new_object_group; result = this->remove_failed_member ( the_object_group.in(), diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index a7cfd9b7997..b2a1b75c6b6 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_ReplicationManager; diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 5afca4f3aac..40c9d52d71c 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -165,7 +165,6 @@ void TAO::Fault_Detector_i::notify() this->notifier_->push_structured_fault(vEvent.in()); if (TAO_debug_level > 5) { - ORBSVCS_ERROR ((LM_ERROR, "return from Fault Detector push Structured Event.\n" )); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index d9cf14c4a7d..b38e41accbc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -29,7 +29,6 @@ static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000); static PortableServer::POA_ptr createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy (PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index a9684eabc99..5bfa60ae725 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -245,7 +245,6 @@ LiveEntry::update_listeners (void) !i.done(); i.advance ()) { - if ((*i)->status_changed (this->liveliness_)) { remove.insert (*i); diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp index aeb716fbab3..cb0a2e31c20 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp @@ -325,7 +325,6 @@ Replicator::send_entity (ImplementationRepository::UpdateInfo &info) int Replicator::send_registration (char *&imr_ior) { - if (this->debug_ > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h index d85b29f5249..ad41e40c92f 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h @@ -29,7 +29,6 @@ */ class Life_Cycle_Service_Server { - public: /// Default constructor Life_Cycle_Service_Server (void); diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index a7c32e168d5..17cdc9b4c9b 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -24,7 +24,6 @@ */ class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service { - public: Life_Cycle_Service_i (int debug_level = 1); ~Life_Cycle_Service_i (void); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index 77e74bcbc34..2cf49e00aba 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -80,7 +80,6 @@ private: */ class AutoFinalizer { - public: AutoFinalizer (TAO_NT_Naming_Service &service); ~AutoFinalizer (); diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index f40c0085859..aeb6267622d 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -248,7 +248,6 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, { while (iter->next_one (binding.out ())) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %C\n\n"), binding->binding_name[0].id.in ())); @@ -295,7 +294,6 @@ Clerk_i::create_clerk (void) { try { - // Create a new clerk object. Pass it the timer value, the set // of server IORs and the no. of servers. ACE_NEW_RETURN (this->time_service_clerk_impl_, diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index ef6c3b7aa7e..c3763c78649 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -76,7 +76,6 @@ Server_i::create_server (void) { try { - // Create a new server object. ACE_NEW_RETURN (this->time_service_server_impl_, TAO_Time_Service_Server, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index 44a3c05f4a4..e26d81af275 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -29,7 +29,6 @@ */ class Consumer : public POA_CosEventComm::PushConsumer { - public: /// This method connects the consumer to the EC. void open (CosEventChannelAdmin::EventChannel_ptr event_channel, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index 3d35dbae5e8..ce68de17b99 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -30,7 +30,6 @@ */ class Consumer : public POA_CosEventComm::PushConsumer, public Multiple { - public: // = Initializatiopn and termination methods. /// Constructor. diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index d7d41e6a634..355a325c1b0 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization... diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index 644331151de..ef01d16308b 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -6,7 +6,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization boiler plate... diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index f2fbc5e6f7f..23e67a7741a 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -492,7 +492,6 @@ void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 995ef08cb47..eb12fd2ab21 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -37,7 +37,6 @@ public: int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ACE_Service_Config config; config.open (argc, argv); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 048c040e03b..896a0253cf1 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -67,7 +67,6 @@ int DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) { try { - orb_ = ORB_init(argc, argv, "DynServer"); Object_var obj = orb_->resolve_initial_references("RootPOA"); @@ -122,7 +121,6 @@ DynServer_Loader::fini (void) { ACE_ASSERT(runner_.get() != 0); try { - ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n")); runner_->end(); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index 985e5be1557..6fe2b8a3ed5 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -23,7 +23,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - ORB_var orb = ORB_init (argc, argv); Object_var obj = orb->resolve_initial_references ("Test"); diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index fcbfaa73162..69cbb3cfe31 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -22,7 +22,6 @@ void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - ACE_NEW_THROW_EX (this->interceptor_, ServerRequestInterceptor, CORBA::NO_MEMORY ( diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h index 267baa0f961..e24f5c1f2f3 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -42,7 +42,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 431cbd63b0a..9bce68a2b19 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -90,7 +90,6 @@ Consumer::run (int argc, ACE_TCHAR* argv[]) void Consumer::push (const CORBA::Any &) { - this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index ab758ee1852..ff931d1f773 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -28,7 +28,6 @@ Supplier::Supplier (void) Supplier::~Supplier () { - } int diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 35637d29aa8..c1b6f85e28c 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -31,7 +31,6 @@ class Filter_StructuredPushSupplier; */ class FilterClient { - public: /// Constructor FilterClient (void); diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 50bb40a03a0..4b34d977cb2 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -10,7 +10,6 @@ static int authorize_2 = 1; CORBA::Boolean SLevel1_Server_i::authorize_level1 (void) { - /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = orb->resolve_initial_references ("SecurityCurrent"); diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 6824b4bacf5..777b90ae46e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -1005,7 +1005,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry; try { - for (;a_feps_iterator.next (a_feps_entry) != 0; a_feps_iterator.advance ()) { @@ -1392,7 +1391,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName, Peer_Info *info; try { - for (this->peer_list_iterator_.first (); (info = this->peer_list_iterator_.next ()) != 0; this->peer_list_iterator_.advance ()) @@ -1479,7 +1477,6 @@ TAO_Base_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &) CORBA::Boolean TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) { - while (!this->is_protocol_object_set ()) TAO_AV_CORE::instance ()->orb ()->perform_work (); return 1; @@ -1762,7 +1759,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) if (flow_spec.length () > 0) { - for (u_int i=0;i<flow_spec.length ();i++) { TAO_AV_FlowSpecSetItor end = this->forward_flow_spec_set.end (); @@ -2535,7 +2531,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, } else { - switch (forward_entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: @@ -2606,7 +2601,6 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep const AVStreams::flowSpec & /* theSpec */) { - throw AVStreams::notSupported (); } @@ -3300,7 +3294,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj) CORBA::Object_ptr TAO_MMDevice::get_fdev (const char *flow_name) { - ACE_CString fdev_name_key (flow_name); AVStreams::FDev_var fdev_entry; if (this->fdev_map_.find (fdev_name_key, fdev_entry) == 0) @@ -3569,7 +3562,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, { try { - AVStreams::FlowProducer_ptr flow_producer = AVStreams::FlowProducer::_duplicate (producer); AVStreams::FlowConsumer_ptr flow_consumer = @@ -3919,7 +3911,6 @@ TAO_FlowEndPoint::destroy () AVStreams::StreamEndPoint_ptr TAO_FlowEndPoint::related_sep () { - return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index b2daa2809f4..ecd767ce52a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -70,7 +70,6 @@ class TAO_AV_Export TAO_Basic_StreamCtrl : public virtual POA_AVStreams::Basic_StreamCtrl, public virtual TAO_PropertySet { - public: /// Default Constructor TAO_Basic_StreamCtrl (void); @@ -188,7 +187,6 @@ class TAO_AV_Export TAO_StreamCtrl : public virtual POA_AVStreams::StreamCtrl, public virtual TAO_Basic_StreamCtrl { - public: /// Default Constructor TAO_StreamCtrl (void); @@ -373,7 +371,6 @@ class TAO_AV_Flow_Handler; class TAO_AV_Export TAO_Base_StreamEndPoint :public virtual TAO_PropertySet { - // @@Naga: Rename this class to TAO_Base_EndPoint since both stream and flowendpoints derive from it. public: TAO_Base_StreamEndPoint (void); @@ -445,7 +442,6 @@ class TAO_AV_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, public virtual TAO_Base_StreamEndPoint { - public: /// Constructor TAO_StreamEndPoint (void); @@ -571,7 +567,6 @@ class TAO_AV_Export TAO_StreamEndPoint_A : public virtual POA_AVStreams::StreamEndPoint_A, public virtual TAO_StreamEndPoint { - public: /// Constructor TAO_StreamEndPoint_A (void); @@ -628,7 +623,6 @@ class TAO_AV_Export TAO_VDev :public virtual TAO_PropertySet, public virtual POA_AVStreams::VDev { - public: /// Default Constructor TAO_VDev (void); @@ -786,7 +780,6 @@ class TAO_AV_Export TAO_FlowConnection : public virtual POA_AVStreams::FlowConnection, public virtual TAO_PropertySet { - public: /// default constructor. TAO_FlowConnection (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 0c5f67b7260..e8150293080 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -530,7 +530,6 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, int result = -1; switch (direction) { - case TAO_AV_Core::TAO_AV_ENDPOINT_A: { result = this->connector_registry_->open (endpoint, @@ -565,10 +564,8 @@ TAO_AV_Core::get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set, TAO_AV_Acceptor* TAO_AV_Core::get_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = @@ -590,10 +587,8 @@ TAO_AV_Core::get_acceptor (const char *flowname) int TAO_AV_Core::remove_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 633df6b7cf2..3040e0034e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -84,7 +84,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); @@ -248,7 +247,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act { try { - // Use the bridge method if (this->make_stream_endpoint (this->stream_endpoint_a_servant_) == -1) return -1; @@ -396,7 +394,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 0639f3cb4cb..900b15724a5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -30,7 +30,6 @@ class TAO_AV_UDP_MCast_Flow_Handler; class TAO_AV_UDP_MCast_Transport :public TAO_AV_Transport { - public: TAO_AV_UDP_MCast_Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 9d3baefcc29..35090bd20e3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -39,7 +39,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper (void) { - } TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void) @@ -318,7 +317,6 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); @@ -486,7 +484,6 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, int TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) { - if (TAO_debug_level > 0) { ACE_TCHAR buf [BUFSIZ]; @@ -509,7 +506,6 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { - TAO_AV_UDP_QoS_Session_Helper helper; this->qos_session_ = helper.open_qos_session (this, @@ -919,7 +915,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { - TAO_AV_UDP_QoS_Session_Helper helper; int result = handler->get_socket ()->open (*inet_addr, @@ -982,7 +977,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (qos_available == 0) { - ACE_Flow_Spec *ace_flow_spec = 0; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, @@ -1001,7 +995,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) } else { - int result = handler->get_socket ()->open (*inet_addr, qos_params, AF_INET, @@ -1283,7 +1276,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, qos); if (qos_available == 0) { - ACE_Flow_Spec* ace_flow_spec; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index d70ef01bb09..a002ac2f47b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -621,7 +621,6 @@ TAO_AV_SCTP_SEQ_Factory::make_connector (void) int TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[]) { - return 0; } @@ -727,7 +726,6 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 8e0291e108d..b555f2e0a09 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -642,7 +642,6 @@ TAO_AV_TCP_Flow_Handler::transport () int TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) { - #if defined (TCP_NODELAY) int nodelay = 1; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 462361e5aa3..d057a1a3f14 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -56,7 +56,6 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core* av_core, TAO_AV_FlowSpecSet &flow_spec_set) { - TAO_AV_FlowSpecSetItor last_flowspec = flow_spec_set.end (); for (TAO_AV_FlowSpecSetItor flow_spec = flow_spec_set.begin (); @@ -386,7 +385,6 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, if (control_flow_factory_name != 0) { - TAO_AV_Flow_Protocol_Factory *control_flow_factory = av_core->get_flow_protocol_factory (control_flow_factory_name); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index ee9d4f7a4b6..2f19adac8bc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -94,7 +94,6 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; @@ -677,7 +676,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, control_inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->control_address ()) ; else { - if (local_addr != 0) { ACE_TCHAR buf [BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index ec50ec8485c..638160e8d52 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -46,7 +46,6 @@ class TAO_AV_UDP_Flow_Handler; class TAO_AV_Export TAO_AV_UDP_Transport :public TAO_AV_Transport { - public: TAO_AV_UDP_Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 28dc0972ce7..ddba84bfa49 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1092,7 +1092,6 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies) policy = policies[i]; switch (policies[i]->type ()) { - case TAO_AV_SFP_CREDIT_POLICY: { TAO_AV_SFP_Credit_Policy *credit_policy = @@ -1269,7 +1268,6 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, break; case TAO_FlowSpec_Entry::TAO_AV_CONSUMER: { - ACE_NEW_RETURN (object, TAO_SFP_Consumer_Object (callback, transport, diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index cc2cd295b79..cc226f585c0 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -18,7 +18,6 @@ ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events) template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer () { - target_->disconnect_push_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 0e5bc198acb..acedc060966 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -232,7 +232,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event) this->typed_event_channel_, this); { - ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); if (!this->is_connected_i ()) @@ -329,7 +328,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( throw CORBA::BAD_PARAM (); { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) // Check if we have a typed event channel if (this->is_typed_ec () ) @@ -405,7 +403,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } { - ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index ab8852c1d3c..13bd60f92eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -161,7 +161,6 @@ void TAO_CEC_Reactive_ConsumerControl::successful_transmission ( PortableServer::ServantBase* proxy) { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->typed_event_channel_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index b7b171e9427..d282d632f19 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -502,7 +502,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper for (CORBA::ULong param=0; param<oper_params->num_params_; param++) { - CORBA::Any any_1; any_1._tao_set_typecode(oper_params->parameters_[param].type_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 366a51a6b84..0a0abc3db9c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -105,7 +105,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : public: /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Receiver object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Receiver objects are heap-allocated.) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index e5aff6c4027..63d5482588f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -102,7 +102,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : public: /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Sender object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Sender objects are heap-allocated.) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index df321abb0ab..168d5f1c7f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -174,7 +174,6 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command() int TAO_EC_Kokyu_Push_Command::execute () { - try { //ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 697bfb25d95..1c03d5c3e2b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -10,7 +10,6 @@ TAO_FT_ClientPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::REQUEST_DURATION_POLICY) return TAO_FT_Request_Duration_Policy::create (val); else if (type == FT::HEARTBEAT_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index 5ae34829868..51a506575ff 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -39,7 +39,6 @@ class TAO_Service_Callbacks; */ class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Services_Activate { - public: /// Constructor TAO_FT_ClientService_Activate (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index e1b6e9e36fd..2875d17ab83 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -82,7 +82,6 @@ CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) { - TAO_Profile *pfile = this->get_primary_profile (ior); @@ -273,7 +272,6 @@ TAO_FT_IOGR_Property::encode_properties ( i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } @@ -337,7 +335,6 @@ TAO_FT_IOGR_Property::get_tagged_component ( i < mprofile.profile_count (); i++) { - // Get the Tagged Components const TAO_Tagged_Components &pfile_tagged = mprofile.get_profile (i)->tagged_components (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index eef04520324..f3b00de2f72 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -44,7 +44,6 @@ class TAO_Profile; class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector : public TAO_Default_Endpoint_Selector { - public: /// Constructor. TAO_FT_Invocation_Endpoint_Selector (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 39bfddf8c53..599125a5802 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -11,7 +11,6 @@ TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::HEARTBEAT_ENABLED_POLICY) return TAO_FT_Heart_Beat_Enabled_Policy::create (val); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index 9d9630318fd..0878f6c3292 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -37,7 +37,6 @@ class TAO_Service_Callbacks; class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object { - public: /// Constructor TAO_FT_ServerService_Activate (void); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index b3b7c97a97a..2592c533001 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; namespace TAO_FTRT { - class TAO_FTRT_Export FTRT_ClientORB_Loader : public ACE_Service_Object { public: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index cf79e91b2a7..87e91459919 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <ACE_PEER_STREAM_1> int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) { - ACE_TRACE("ConnectionAcceptHandler::open\n"); ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 932beb8d789..c599f29c02b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -209,7 +209,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( const FtRtecEventComm::ObjectId& supplier_admin_oid, const FtRtecEventComm::ObjectId& consumer_admin_oid) { - iogr_maker_.init(orb.in()); TAO_EC_Event_Channel_Base::activate(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 7d74d1cd4fc..f7ea13c4b68 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -16,7 +16,6 @@ void FTEC_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - Request_Context_Repository().allocate_slots(info); PortableInterceptor::ClientRequestInterceptor_var client_interceptor; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index c962ed0542a..9f10f46185c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -26,7 +26,6 @@ void TAO_FTEC_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &result) { - result = RtecEventChannelAdmin::ProxyPushSupplier::_nil(); try{ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index bcdc0daaf3d..9cb1ef8e12c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -225,7 +225,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn Request_Context_Repository().set_ft_request_service_context(ri, service_context); try{ - FTRT::TransactionDepth transaction_depth = get_transaction_depth_context(ri); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index f3cc27ee85e..865b4021f06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -164,7 +164,6 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior) if (pfile_tagged.get_component (tagged_components) == 1) { - // Grab the object group version // @@ NOTE: This involves an allocation and a dellocation. This is // really bad. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index b1ea8b8744e..cf10ef2f7c5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { - namespace { Identification_Service* service; const char oid[] = "\xF8\xB3\xB1\xFE\xAC\xC6\x07\x11\x02\x0C\x02\x50\xEB\x05\x77\xD0"; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 56f1375fc9b..96234bbe088 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - unsigned int Log::log_level_; #ifndef NDEBUG diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 9c88345705f..44a5b6a5803 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - /** * A utility class for logging messages. */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 8e717c86814..a34987a965d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -11,7 +11,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FtRt { - static union { struct diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 2dc5c7fea9f..5b0db8fcf91 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -48,7 +48,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Acceptor concrete call definition /** diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 057d7ebe609..2a57d9cd233 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -34,7 +34,6 @@ namespace TAO { namespace HTIOP { - /** * @class Completion_Handler * @@ -52,7 +51,6 @@ namespace TAO class HTIOP_Export Completion_Handler : public COMPLETION_BASE { - public: Completion_Handler (ACE_Thread_Manager* t = 0); /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index de51d760b7e..6fd2aad59b2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -94,7 +94,6 @@ TAO::HTIOP::Connection_Handler::open (void*) if (local_addr.is_ip_equal (remote_addr) && local_addr.get_port_number () == remote_addr.get_port_number ()) { - if (TAO_debug_level > 0) { ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16]; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 55cc6925d4c..799dc586f49 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connection_Handler * diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 1c437dd30ae..653d2051a81 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -115,7 +115,6 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout) { - /** * \par * Connector is used only in the processes inside the firewall diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 110885ef92e..ad085c87184 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -15,7 +15,6 @@ Connect_Creation_Strategy (ACE_Thread_Manager* t, orb_core_ (orb_core), arg_ (arg) { - } template <class SVC_HANDLER> int diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 7369d51747d..f1fcfa313db 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connect_Creation_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index 215746fba61..8094f89ca66 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -32,7 +32,6 @@ namespace TAO { namespace HTIOP { - class Connection_Handler; /** diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 473fded9872..d7d854ea193 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -38,7 +38,6 @@ namespace TAO { namespace HTIOP { - class HTIOP_Export Protocol_Factory : public TAO_Protocol_Factory { public: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 5392f3e6427..a70b23bbf4b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -85,7 +85,6 @@ TAO::HTIOP::Profile::~Profile () int TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr) { - // Decode host and port into the <endpoint_>. if (cdr.read_string (this->endpoint_.host_.out ()) == 0 || cdr.read_ushort (this->endpoint_.port_) == 0 diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index c68c9479aea..096f7769733 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -35,7 +35,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Profile concrete Profile definitions /** * @class HTIOP_Profile diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 296db0bad23..b70102efeff 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -76,7 +76,6 @@ TAO::HTIOP::Transport::recv (char *buf, TAO_debug_level > 4 && errno != ETIME) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ") ACE_TEXT ("read failure - %m"), @@ -304,7 +303,6 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, if (local_addr.get_port_number() != 0) { - // Note: Looks like there is no point in sending the list of // endpoints on interfaces on which this connection has not // been established. If this is wrong, please correct me. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 0ea55cdec43..887a15d272b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -73,7 +73,6 @@ namespace TAO * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler * invalidate_event_handler_i (void); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index bee15bad26d..bf350e62991 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -55,7 +55,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 176389a57a4..e0c97f22a96 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -52,7 +52,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 7a56c08464e..a1c56aaee6e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -157,7 +157,6 @@ private: * Cached LeastLoaded load balancing strategy property values. */ //@{ - /// The critical load threshold. /** * Load rebalancing/shedding will occur if loads at a given location diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 79b55cfb605..6d0dcad26d8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -37,7 +37,6 @@ public: * Methods required by the CosLoadBalancing::LoadAlert interface. */ //@{ - /// Forward requests back to the load manager via the object group /// reference. virtual void enable_alert (void); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index f132a1161e7..1013d609f8d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -134,7 +134,6 @@ private: * Cached LoadAverage load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index b5fb4e0a12f..cd167477d94 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1062,7 +1062,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0) { - if (info->props.length () == 0) { { @@ -1104,7 +1103,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0) { - if (info->props.length () == 0) { { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index e2f2a817730..fd862cb98c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -54,7 +54,6 @@ public: * Methods required by the CosLoadBalancing::LoadManager interface. */ //@{ - /// For the PUSH load monitoring style. virtual void push_loads (const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads); @@ -107,7 +106,6 @@ public: * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -167,7 +165,6 @@ public: * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -227,7 +224,6 @@ public: * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 3f09e937742..4534ce83ddb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -311,7 +311,6 @@ TAO_LB_LoadMinimum::analyze_loads ( } else { - CORBA::Float percent_diff = (tmp[j].value / min_load) - 1; @@ -408,7 +407,6 @@ TAO_LB_LoadMinimum::get_location ( */ if (load.value < min_load) { - if (i > 0 && !ACE::is_equal (load.value, 0.0f)) { /* diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index a95028fa71e..ab40cf82301 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -158,7 +158,6 @@ private: * Cached LoadMinimum load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index aa84e671c77..fe2a5bb6bbd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -51,7 +51,6 @@ public: * interface. */ //@{ - /// Clients requests are forwarded via the /// PortableServer::ForwardRequest exception thrown in this method. virtual PortableServer::Servant preinvoke ( diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 1929ea3e2be..1f386f9b1c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -17,7 +17,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, poa_(PortableServer::POA::_duplicate(poa)), log_poa_(PortableServer::POA::_duplicate(log_poa)) { - // Create an instance of the event channel. TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), this->poa_.in()); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 44054f36974..463f267f3ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -17,7 +17,6 @@ TAO_LogNotification::~TAO_LogNotification () void TAO_LogNotification::object_creation (DsLogAdmin::LogId id) { - CORBA::Any any; DsLogNotification::ObjectCreation event; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 496c437b278..819a27257f6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Log_Serv_Export TAO_LogNotification { - public: /// Constructor. TAO_LogNotification (void); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index c5485ab1291..1f1475a2f9f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -694,7 +694,6 @@ int TAO_Log_Constraint_Visitor::visit_binary_expr ( ETCL_Binary_Expr *binary_expr) { - // Evaluate the constraint int bin_op_type = binary_expr->type (); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 5069493ac29..5ae33dc3a19 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -46,7 +46,6 @@ class TAO_LogMgr_i; */ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log { - public: /// Constructor. TAO_Log_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 1c6ac6b1f17..cdf78e7637e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -12,7 +12,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i () TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf) : notify_factory_ (ecf) { - CosNotifyChannelAdmin::ChannelID id; CosNotifyChannelAdmin::AdminID adminID = 0; CosNotification::QoSProperties initial_qos; diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 725c4952af7..1aead3245ab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -10,7 +10,6 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( : TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { - CosNotifyComm::PushSupplier_var objref = this->_this (); ACE_ASSERT (!CORBA::is_nil (objref.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 3cf48ab0234..6a508441855 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -15,7 +15,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)), poa_ (PortableServer::POA::_duplicate (poa)) { - CosNotifyChannelAdmin::ChannelID channel_id; CosNotification::QoSProperties initial_qos; @@ -92,7 +91,6 @@ TAO_NotifyLog_i::destroy () void TAO_NotifyLog_i::activate () { - CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index bbcc5c060af..4aab236323b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -25,7 +25,6 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( : TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { - obtainProxyConsumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index c63d99d4e41..661eed9e4f8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -29,7 +29,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, poa_ (PortableServer::POA::_duplicate (poa)), log_poa_ (PortableServer::POA::_duplicate (log_poa)) { - TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in()); ACE_NEW_THROW_EX (this->event_channel_, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index 4a3c0bafc58..05b715bb4ef 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -314,7 +314,6 @@ void TAO_FT_Naming_Manager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -364,7 +363,6 @@ TAO_FT_Naming_Manager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -451,7 +449,6 @@ TAO_FT_Naming_Manager::add_member ( if (this->group_factory_.find_group (object_group, group)) { try { - group->add_member (the_location, member); } @@ -567,7 +564,6 @@ PortableGroup::ObjectGroupId TAO_FT_Naming_Manager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -661,7 +657,6 @@ TAO_FT_Naming_Manager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -743,7 +738,6 @@ TAO_FT_Naming_Manager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index b57c6786a03..5dac7989663 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -107,7 +107,6 @@ public: * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -167,7 +166,6 @@ public: * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -230,7 +228,6 @@ public: * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -321,7 +318,6 @@ private: * and Random are supported. */ //@{ - /// The "RoundRobin" load balancing strategy. TAO_FT_Round_Robin round_robin_; /// The "Random" load balancing strategy. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index ae18aa384f8..82966a97945 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -163,7 +163,6 @@ TAO_FT_Naming_Replication_Manager::svc () } try { - this->orb_->run (); } catch (const CORBA::SystemException &ex) @@ -349,7 +348,6 @@ TAO_FT_Naming_Replication_Manager::send_context_update (const ACE_CString & name void TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index b9bd3c43792..2a6da089e86 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -126,7 +126,6 @@ TAO_FT_Naming_Server::update_info_i () void TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos) { - CORBA::ULong count = infos.length(); FT_Naming::UpdateInfo* guts = infos.get_buffer(true); FT_Naming::UpdateInfoSeq_var block = 0; @@ -412,7 +411,6 @@ TAO_FT_Naming_Server::init_replication_pairing () void TAO_FT_Naming_Server::no_replica () { - if (this->server_role_ == BACKUP) { this->recover_iors (); @@ -931,7 +929,6 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt } else { - this->assign (combo, false, iorm->add_profiles (peer, this->iors_[local].ref_.in ())); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index d9637040909..b1fbdc028a0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -50,7 +50,6 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n) // Get the locations of the object group members and we will use them to // do the load balancing try { - // Make sure object is an object group. // We will return the object reference all the way back out to the client // if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 93023f53754..a7e0034a1f9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -54,7 +54,6 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n) CORBA::Object_var resolved_ref = TAO_Storable_Naming_Context::resolve(n); try { - // Make sure object is an object group. // We will return the object reference as is all the way back // out to the client if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 3bd9059c4ca..0787924201c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -40,7 +40,6 @@ NS_group_svc::determine_policy_string (const ACE_TCHAR *policy, int NS_group_svc::set_orb( CORBA::ORB_ptr orb) { - this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) @@ -59,7 +58,6 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) int NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) { - this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) @@ -77,7 +75,6 @@ NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) int NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) { - this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) @@ -235,7 +232,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name, try { - PortableGroup::ObjectGroup_var group_var = this->naming_manager_->get_object_group_ref_from_name (ACE_TEXT_ALWAYS_CHAR(group_name)); @@ -370,7 +366,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) } catch (const CORBA::Exception& ) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, @@ -390,7 +385,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) int NS_group_svc::group_list () { - // KCS: The group list is independent of locations. I created a new operation in the // naming manager IDL to support requesting the group list - which is a list of names @@ -435,7 +429,6 @@ NS_group_svc::display_load_policy_group(FT_Naming::LoadBalancingStrategyValue st display_label)); if ( list->length () > 0 ) { - for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); @@ -841,7 +834,6 @@ NS_group_svc::member_show (const ACE_TCHAR* group_name, } catch (const PortableGroup::ObjectGroupNotFound&) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 31a12fe6b78..ca66d6f9fd6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -48,7 +48,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Naming_Serv_Export TAO_Bindings_Map { - public: /// Destructor. virtual ~TAO_Bindings_Map (void); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 11858f0ece8..2d0f3187ff1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -166,7 +166,6 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n) // Stringify the name for (i=0; i < n.length (); ++i) { - // Stringify Id // const char *id = n[i].id.in (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 31cf92cecab..38c54893402 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -79,7 +79,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) { - if (this->naming_server_ == 0) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index d1448c979aa..c7fda38a709 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -572,7 +572,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Initialize Persistent Naming Service. // { - // Create Naming Context Implementation Factory to be used for the creation of // naming contexts by the TAO_Persistent_Context_Index TAO_Persistent_Naming_Context_Factory *naming_context_factory = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 896f31bc96f..91dea26ee15 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -144,7 +144,6 @@ TAO_Persistent_Context_Index::init (size_t context_size) // CASE 1:there are no Naming Contexts registered. We need to create // one. { - this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp index 771c2bed9c2..bbb96410dba 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory () { - } /// Destructor. Does not deallocate the hash map: if an instance of diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 9b113af9710..abb5b1edd81 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -307,7 +307,6 @@ bool TAO_Storable_Naming_Context:: File_Open_Lock_and_Check::object_obsolete () { - // Query the underlying context if it is obsolete with respect // to the provided file last-changed time return (context_->is_obsolete (fl_->last_changed ())); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index f4f20070e81..b98b23b428c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -40,7 +40,6 @@ TAO_Storable_Naming_Context_Activator::incarnate ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) { - // Make sure complete initialization has been done ACE_ASSERT (persistence_factory_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index 92043029904..11b9c28a74e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -11,7 +11,6 @@ //#define DEBUG_MEMORY_USE #if defined(_MSC_VER) && defined (_DEBUG) && defined (DEBUG_MEMORY_USE) namespace CRT{ - /// \brief dump heap allocation stats /// /// This works only on microsoft/windows compilers diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 31456ab5d13..f4fc3f72dee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -16,7 +16,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier () void TAO_Notify_CosEC_ProxyPushSupplier::release () { - delete this; //@@ inform factory } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index 34098fab019..0d1ff9bd3a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -4,7 +4,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Bit_Vector::Bit_Vector() : size_(0) , first_set_bit_(0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 0f5218fee01..e23a1fd7713 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief Simple bit vector. /// /// Written to support block allocation from persistent storage. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 5f200fb4200..0c07aa666a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -40,7 +40,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer , public ACE_Event_Handler // to support timer { - public: /// Status returned from dispatch attempts enum DispatchStatus { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 3bec07b367b..94592d57ea7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /////////////////// // Delivery_Request Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_t request_id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index ec73cc7a992..aa677a67791 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -20,7 +20,6 @@ class TAO_Notify_ProxySupplier; namespace TAO_Notify { - // Forward declarations of TAO_Notify classes/pointers/collections declared // in this header class Delivery_Request; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 09478a46c01..1c86bd16611 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -17,7 +17,6 @@ template <class PROXY, class ACE_LOCK> TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void) :proxy_count_ (0) { - } template <class PROXY, class ACE_LOCK> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 8a9a026f93d..beb1e84ed5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T { - public: typedef TAO_Notify_Event_Map_Entry_T<PROXY> ENTRY; diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 9ab170a5295..e218316dff5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -36,7 +36,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin : public TAO_Notify::Topology_Object { - public: /// Constructor TAO_Notify_FilterAdmin (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 72564775ee2..f319745bcf6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Persistent_Callback::~Persistent_Callback() { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index 3ac466ff73c..0f8454dc222 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief An interface to allow callbacks on completion of persistent storage /// requests. class TAO_Notify_Serv_Export Persistent_Callback diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index b22c6be82d5..2c0d25b1576 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -34,7 +34,6 @@ TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T ( value_ (rhs.value_), valid_ (rhs.valid_) { - } template <class TYPE> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index b1e3488ab5e..3e775ab64b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Random_File::Random_File() : block_size_(512) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index 7270b9264a0..0ffb9e321c2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief A random file class. * diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index 9fe228cb5a1..23a16a12306 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -36,7 +36,6 @@ class TAO_Notify_Method_Request_Queueable; namespace TAO_Notify { - class Routing_Slip_Persistence_Manager; // Forward declarations of TAO_Notify classes/pointers/collections diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 7d76533d46b..6ae29fe6bb9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Routing_Slip_Persistence_Manager::Routing_Slip_Persistence_Manager( Standard_Event_Persistence_Factory* factory) : removed_(false) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index a9834a5c602..877339272d2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Standard_Event_Persistence::Standard_Event_Persistence () : filename_ (ACE_TEXT ("__PERSISTENT_EVENT__.DB")) , block_size_ (512) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index 71e6af692ff..3a32f0c6411 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -32,7 +32,6 @@ namespace CORBA namespace TAO_Notify { - /// A forward declaration. class Topology_Object; diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index de945ca731a..e7083c5dd3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief Save Notification Service Topology to an XML file. */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 56258982147..ebc331319c6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -69,7 +69,6 @@ namespace namespace TAO_PG { - Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h index d8bd18cf11c..aae684c4044 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - /** * @class Fragments_Cleanup_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index afea09a6227..08026413a2a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class TAO_PortableGroup_Export MIOP_Loader { public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 5364b87d4ea..4f46abd4cfc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -504,7 +504,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( PortableGroup::FactoryInfo & info = infos[nInfo]; if (info.the_location == location) { - ORBSVCS_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n", this->identity_.c_str(), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 78225419532..5a38b231d4b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -26,7 +26,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory ( TAO_PG_GenericFactory::~TAO_PG_GenericFactory () { - TAO_PG_Factory_Map::iterator end = this->factory_map_.end (); for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin (); i != end; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index ade780d23dc..1eaf3e2409c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -60,7 +60,6 @@ public: * @name TAO_LoadBalancer::GenericFactory methods */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index d3f449d878a..85da0670930 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_PG_Location_Hash { - public: /// Creates a hash based on all of elements of the given Location CORBA::ULong operator() (const PortableGroup::Location &) const; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index fea5fe206ce..6848d53a3e1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -59,7 +59,6 @@ public: * interface. */ //@{ - /// Create a member and add it to the given object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 20d0fa6446d..5bc3b5acfce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -55,7 +55,6 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Object_Group { - protected: // Information about an object group member struct MemberInfo diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 621ef2a2d6b..c71ccf1fdad 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class TAO::PG_Object_Group_Manipulator * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 9e357254945..bdd7d020f7a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -37,7 +37,6 @@ namespace namespace TAO { - class Object_Group_File_Guard : public TAO::Storable_File_Guard { public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 4b513028273..b6b7bc593b1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -59,7 +59,6 @@ public: * interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index b2cab12269d..2491568dc71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class PG_Property_Set; typedef ACE_Refcounted_Auto_Ptr<PG_Property_Set, TAO_SYNCH_MUTEX> PG_Property_Set_var; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 4d365eb44e1..698b3ae661f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -52,7 +52,6 @@ namespace TAO i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index d4bacec1300..20b45315b43 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -50,7 +50,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : public TAO_UIPMC_SVC_HANDLER, public TAO_Connection_Handler { - public: TAO_UIPMC_Connection_Handler (ACE_Thread_Manager* t = 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index b2481923238..7f2e48da9de 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -52,7 +52,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler *event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c0d9b19aa45..b6a253e0096 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - UIPMC_Recv_Packet_Cleanup_Guard::UIPMC_Recv_Packet_Cleanup_Guard ( TAO_UIPMC_Mcast_Transport *transport ) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 8d29cc82746..2bf20d34d9d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -26,7 +26,6 @@ class TAO_UIPMC_Mcast_Transport; namespace TAO_PG { - /** * @class UIPMC_Recv_Packet_Cleanup_Guard * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index 8d5624add13..93d8c76ca9e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_UIPMC_Wait_Never : public TAO_Wait_Strategy { - public: /// Constructor. TAO_UIPMC_Wait_Never (TAO_Transport *transport); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 38693b09cef..44597e3f600 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -490,7 +490,6 @@ TAO_PropertySet::define_property (const char *property_name, CORBA::Boolean TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { - // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) return 1; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 548efc4572d..8c9ce8859b5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class IIOP_SSL_Connection_Handler * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 996dc779302..baaa1dd427b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -34,7 +34,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Accept_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 56aab64b0a1..00d8d4610b6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -518,7 +518,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( } else { - bool make_new_connection = (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) || (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY @@ -526,7 +525,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (make_new_connection) { - if (TAO_debug_level > 4) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 13a3d95679a..4d6ccfd6e50 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -718,7 +718,6 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { if (ssl_ctx->private_key (private_key_path.in(), private_key_type) != 0) { - ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to set ") ACE_TEXT ("SSL private key ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 653b29e9786..502ba128b68 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -40,7 +40,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Protocol_Factory * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 92e01b78220..3c98dcb63ac 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // { // namespace SSLIOP // { - /** * @class Profile * diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 0bb52ccb898..debf6832652 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -160,7 +160,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority) { - if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -184,7 +183,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Type_t dependency_type) { - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -219,7 +217,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) { - // Initialize the scheduler implementation. impl->init (minimum_priority, maximum_priority); @@ -424,7 +421,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type) { - if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -439,7 +435,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t ACE_Config_Scheduler::last_scheduled_priority () { - RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); if (priority < 0) diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index ed94b74ec40..4a0521bc6f6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -1408,7 +1408,6 @@ ACE_DynScheduler::relate_task_entries () ACE_DynScheduler::status_t ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry) { - // may have entered at a non-root node previously, so this does // not necessarily indicate a cycle in the dependency graph if (entry.dfs_status () != Task_Entry::NOT_VISITED) @@ -1823,7 +1822,6 @@ ACE_DynScheduler::create_timeline () Dispatch_Entry *rescheduled_entry; while (reschedule_queue.is_empty () == 0) { - if (reschedule_queue.dequeue_head (rescheduled_entry) < 0) { status = ST_BAD_INTERNAL_POINTER; @@ -1939,7 +1937,6 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (FILE *file) { - u_long dispatch_count = 0; u_long i = 0; for (i = 0; i < dispatch_entry_count_; ++i) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index c9e1b13d171..4f36228d52f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -1158,7 +1158,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, // If everything is already up to date, we're done. if (SCHED_ALL_STABLE == stability_flags_) { - // Must always provide a value for an out parameter ACE_NEW_THROW_EX (anomalies, RtecScheduler::Scheduling_Anomaly_Set (0), @@ -1172,7 +1171,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, if ((this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) || (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)) { - #if defined (SCHEDULER_LOGGING) ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, this->rt_info_count_, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 2d4d423f49e..a6d18f5246e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -521,7 +521,6 @@ int ACE_Scheduler_Factory::dump_schedule void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * entry, FILE* file) { - if( entry == 0 ) { ACE_OS::fprintf (file, "Entry is NULL"); @@ -630,7 +629,6 @@ void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, } else { - ACE_OS::fprintf (file, subset_tuple_format, (*tuple_ptr_ptr)->handle, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 40d9a483ae0..18abc0ccae3 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -67,7 +67,6 @@ public: */ struct POD_RT_Info { - const char *entry_point; RtecScheduler::handle_t handle; RtecScheduler::Time worst_case_execution_time; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 28692798286..d7e3016e365 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -30,7 +30,6 @@ namespace TAO { namespace Security { - /** * @class EstablishTrustPolicy * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index cafcc2f1856..554c5f83fd3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -30,7 +30,6 @@ namespace TAO { namespace SL3 { - /** * @class CredentialsAcquirerFactory * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 73dff6188f9..1024d153449 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -33,7 +33,6 @@ namespace TAO { namespace SL3 { - /** * @class olicyFactory * @@ -55,7 +54,6 @@ namespace TAO * sub-classes. */ //@{ - /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 46b7cd4404f..45a40e92e4f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -36,7 +36,6 @@ namespace TAO { namespace Security { - /** * @class PolicyFactory * diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index aeb74e75716..85761774632 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -109,7 +109,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, } else if (up2 < lb1) { - ACE_NEW_RETURN (tio, TAO_TIO (0, 0), CosTime::OTNoOverlap); diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 2dfdaaf37df..b5757753635 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -18,7 +18,6 @@ Timer_Helper::Timer_Helper () Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk) : clerk_ (clerk) { - } Timer_Helper::~Timer_Helper () diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 189fccdf3a8..d59f6a4d0d2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -873,8 +873,6 @@ YY_DECL } { - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1560,7 +1558,6 @@ static int yy_get_next_buffer () */ void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1578,7 +1575,6 @@ static int yy_get_next_buffer () */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -1653,7 +1649,6 @@ static void yy_load_buffer_state () */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -1786,7 +1781,6 @@ static void yyensure_buffer_stack () yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { - /* First allocation is just for 2 elements, since we don't know if this * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. @@ -1807,7 +1801,6 @@ static void yyensure_buffer_stack () } if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - /* Increase the buffer to prepare for a possible push. */ yy_size_t grow_size = 8 /* arbitrary grow size */; @@ -1875,7 +1868,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) */ YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); } @@ -1961,8 +1953,6 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno () { - - return yylineno; } @@ -2013,8 +2003,6 @@ char *yyget_text () */ void yyset_lineno (int _line_number ) { - - yylineno = _line_number; } @@ -2090,7 +2078,6 @@ static int yy_init_globals () /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy () { - /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer( YY_CURRENT_BUFFER ); @@ -2121,7 +2108,6 @@ int yylex_destroy () #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; @@ -2149,7 +2135,6 @@ void *yyalloc (yy_size_t size ) void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 676c18a8c9f..7215d070a95 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -304,7 +304,6 @@ static const YYINT yyctable[] = { -1, #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) #if YYDEBUG static const char *const yyname[] = { - "$end",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -769,7 +768,6 @@ yyloop: } else { - /* Unresolved conflict - start/continue trial parse */ YYParseState *save; #if YYDEBUG diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index e79269ae7b3..6f581a9456c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -62,7 +62,6 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, // populate the sequence. for (CORBA::ULong i = 0; i < offers_in_sequence; i++) { - CosTrading::Offer *source = 0; this->offers_.dequeue_head (source); this->pfilter_.filter_offer (source, offers[i]); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index 28c928f070a..2dbad344b80 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -29,7 +29,6 @@ visit_property (TAO_Property_Constraint* literal) if (this->props_.find (prop_name, prop_index) == 0) { - CORBA::Any *value = 0; // Retrieve the value of the property from the Property_Evaluator try diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 2c613786e29..b8fcb9539dd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -10,7 +10,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>:: TAO_Trader (TAO_Trader_Base::Trader_Components components) { - // @@ Seth, we need a way to propagate the exception out. This will // not work on platforms using environment variable. for (int i = LOOKUP_IF; i <= LINK_IF; i++) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index 1a3227e308a..a78f31a531c 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -67,7 +67,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index 3a219db610d..22454390add 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -212,7 +212,6 @@ join_object_group (CORBA::ORB_ptr orb, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 1834abd43b5..484d20cc47c 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -41,7 +41,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 09d65fc4c2d..5e27f49fbfa 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -12,7 +12,6 @@ Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, Test::number cl_number) { - if (cl_number % 2 == 0) { for (int i = 1; i < 10000; i++) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 95fadc92423..7e7bdc750a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); @@ -80,7 +79,6 @@ private: */ class Distributer_Sender_Callback : public TAO_AV_Callback { - public: //// Called when the sender has finished reading the file and wants //// to close down the connection. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index aa0dcd94807..b09446f5468 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -145,7 +145,6 @@ Receiver::Receiver (void) Receiver::~Receiver (void) { - } ACE_CString diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 2244aedb8a0..87407f68ad3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index b7b47d1a487..4b9f16c1999 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -296,7 +296,6 @@ Sender::pace_data (void) /// Continue to send data till the file is read to the end. while (1) { - if (g_shutdown == 1) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 9e3aa82ec9f..624cf488220 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); @@ -44,7 +43,6 @@ public: */ class Sender_Callback : public TAO_AV_Callback { - public: /** * Called when the sender has finished reading the file and wants diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 505e18eb11c..5038555626a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -216,7 +216,6 @@ Client::init (int argc, ACE_TCHAR *argv[]) CORBA::String_var ior; try { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 9911cbb775a..e6e8cb44664 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -303,7 +303,6 @@ Ping_Send_Callback::get_timeout (ACE_Time_Value *&tv, int Ping_Send_Callback::handle_timeout (void *) { - this->count_++; ACE_DEBUG ((LM_DEBUG, "Ping timeout frame %d\n", this->count_)); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 8cf9a9605bd..e7e42a437dd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -45,7 +45,6 @@ private: // = AVStreams calls this class during connection setup. class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint { - public: /// Create a receiver application callback. int get_callback (const char *flowname, diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 8f559e80797..b72278736b9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -239,8 +239,6 @@ Sender::init (int argc, int Sender::pace_data (void) { - - // The time between two consecutive frames. inter_frame_time.set (1 / (double) this->frame_rate_); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ecfa3b10ac3..37a8dfefa2f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -15,7 +15,6 @@ FTP_Client_Callback::handle_end_stream (void) FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void) : callback_ (0) { - } void @@ -182,7 +181,6 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - try { // Initialize the naming services @@ -212,7 +210,6 @@ Client::bind_to_server (const char *name) int Client::init (int argc, ACE_TCHAR *argv[]) { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 707c54a2bc7..d5efa17a616 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -66,7 +66,6 @@ Server::init (int argc, { try { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); @@ -121,7 +120,6 @@ Server::run (void) CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb(); try { - while( !done ) { CORBA::Boolean wp = orb->work_pending (); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 4767b8cb342..e05923885f4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -280,7 +280,6 @@ Client::init (int argc, int Client::pace_data (void) { - // Rate at which frames of data need to be sent. this->frame_rate_ = CLIENT::instance ()->frame_rate (); @@ -303,7 +302,6 @@ Client::pace_data (void) try { - // Continue to send data till the file is read to the end. while (1) { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 9c39b387c14..b3075bfe36a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -50,7 +50,6 @@ public: */ class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint { - public: /// Constructor FTP_Client_StreamEndPoint (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index b1960af2242..c0d90d7c4a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -26,7 +26,6 @@ */ class FTP_Server_Callback : public TAO_AV_Callback { - public: // Method that is called when there is data to be received from the ftp client. int receive_frame (ACE_Message_Block *frame, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 6e993b1c39e..090fbf54245 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -88,7 +88,6 @@ TimeStamp_Protocol_Object::handle_input (void) // } // else // { - // ACE_DEBUG ((LM_DEBUG, // "(%N|%l) Frame Size %d\n", // n)); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 0c9d41de402..c2eabbc1e9f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -342,8 +342,6 @@ Sender::init (int argc, int Sender::pace_data (void) { - - // The time between two consecutive frames. inter_frame_time.set (1.0 / this->frame_rate_); diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 37148f5d58f..a8a0be20826 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -19,7 +19,6 @@ public: TimeModule::TimeOfDay Time_impl::get_gmt (void) { - time_t time_now = ACE_OS::time(0); struct tm *time_p = ACE_OS::gmtime(&time_now); @@ -41,7 +40,6 @@ Time_impl::Shutdown (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index e5be4e90c2f..77444fc3533 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -52,7 +52,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index ee0007dd5bc..04240e20fac 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -79,7 +79,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Manager manager; try diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp index 0795ed687ce..bbf5b376e30 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp @@ -38,7 +38,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr // ) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index b029a16325a..8db5270df68 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -47,8 +47,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - try { Server_ORBInitializer *temp_initializer = 0; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp index 03d34cf3108..34d392ea77e 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp index b23cba1c322..1d41831d853 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp index df9db17965f..17f53a73de3 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp index 444ace92c12..6a3ba02a1d6 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp @@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Start the Naming Service tasks namingServiceA_.activate(); diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp index a0dc4495e41..57073f3c85a 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp index f9ea2ede22a..63623414149 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp @@ -10,7 +10,6 @@ Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ) { - } void diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index 4b49e5f9559..164895340fb 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -85,7 +84,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - ACE_OS::printf("Message from: %s\nSubject: %s\nMessage: %s\n", user_name, subject, message); //cout << "Message from: " << user_name << endl; diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp index 03dbefa4624..75ebbf9449a 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp index 444ace92c12..6a3ba02a1d6 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp @@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Start the Naming Service tasks namingServiceA_.activate(); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp index a0dc4495e41..57073f3c85a 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 696c94c1fd1..9ca80305f9e 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -737,7 +737,6 @@ ace_cc_yyreduce: switch (ace_cc_yyn) { - case 2: { cmdlist->add(new CC_Sleep_Cmd(0)); /* dummy to check exeption in the last command */ diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 464cd574c18..876f00d0c1b 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -26,7 +26,6 @@ static const int data_items = 60000; void * run_orb_within_thread (void *) { - while (! terminate_threads) { try diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index a21e9be6afa..f98e7edcaee 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -86,7 +86,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[]) j < this->local_federations_[i]->supplier_types (); ++j) { - ACE_DEBUG ((LM_DEBUG, " name = <%s>\n" " ipadd = <%x>\n", diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 39213e5582f..731a92e2cca 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -904,7 +904,6 @@ void Test_ECG::shutdown_supplier (void* /* supplier_cookie */, RtecEventComm::PushConsumer_ptr consumer) { - this->running_suppliers_--; if (this->running_suppliers_ != 0) return; diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a1877edb197..f18548a703e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -204,7 +204,6 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, int EC_Supplier_Task::svc (void) { - // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index f9b3a8f6f46..67ad778a036 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -149,7 +149,6 @@ void FT_TestReplica_i::suicide(const char * note) //static const char * FT_TestReplica_i::repository_id() { - const char * id = FT_TEST::_tc_TestReplica->id(); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index e6d482c0814..be9bed2e5fd 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -262,7 +262,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( ::PortableGroup::GenericFactory::FactoryCreationId_var creation_id; if (this->have_replication_manager_) { - ////////////////////////////////////////////////////// // note infrastructure controlled because we want the // ReplicationManager to manage the object after it's created. diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index d01246bfada..41fa104ce9d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -303,7 +303,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } switch(test_type) { - case TT_FAILOVER: if( RC_SUCCESS != do_failover_name_test ( @@ -342,7 +341,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) case TT_PERSISTENCE: switch(test_phase){ - case TT_CREATE: if (RC_SUCCESS != do_persistence_name_test ( orb.in (), @@ -493,7 +491,6 @@ do_failover_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -581,7 +578,6 @@ do_failover_name_test ( // Try again... try { - CORBA::Object_var obj1_on_replica = root_context_1->resolve (level1); @@ -1018,7 +1014,6 @@ do_failover_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_1; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) { @@ -1123,7 +1118,6 @@ do_persistence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in () )) @@ -1280,7 +1274,6 @@ do_persistence_name_test ( } try { - // Check if the new context is available in the repository CORBA::Object_var obj1_on_replica = root_context_1->resolve (wide); @@ -1346,7 +1339,6 @@ do_persistence_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_1; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -1427,14 +1419,12 @@ do_persistence_objectgroup_test ( { const PortableGroup::Location & loc = locations[i]; if (loc.length() > 0) { - ACE_DEBUG (( LM_DEBUG, ACE_TEXT ("INFO: validating group member %C\n"), loc[0].id.in())); try { - PortableGroup::Location location_name (1); location_name.length (1); location_name[0].id = CORBA::string_dup(loc[0].id.in()); @@ -1463,7 +1453,6 @@ do_persistence_objectgroup_test ( the_string.in ())); if ( ACE_OS::strcmp (the_string.in (), loc[0].id.in()) != 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: object group member at %C reports %C\n\n"), loc[0].id.in(), @@ -1665,7 +1654,6 @@ do_equivalence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -1883,7 +1871,6 @@ do_equivalence_name_test ( // Try again to see if it just was a race condition try { - CORBA::Object_var obj1_on_replica = root_context_2->resolve (wide); @@ -2245,7 +2232,6 @@ do_equivalence_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_2; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) { diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp index eb1707d6755..145b8648b46 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp index 370be8a05a1..717df80dbae 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp @@ -47,7 +47,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) TAO_Naming_Client name_svc; try { - ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service if (name_svc.init (orb.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -74,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (int i = 0; i < 15; i++) { try { - // Each time we invoke resolve, we get a different member tmp = name_svc->resolve (name); @@ -133,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp index 522b3cf5cc9..56e05df6664 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp @@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) TAO_Naming_Client name_svc; try { - ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service if (name_svc.init (orb.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -144,7 +143,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } try { - // Each time we invoke resolve, we get a different member tmp = name_svc->resolve (name); @@ -205,7 +203,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) hammer.wait (); try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 90958d5b065..a042e02b820 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -57,7 +57,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Manager manager; try diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index ca44b8bc7eb..4e66d38fddf 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -32,8 +32,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 643b5112299..8803f71bfa9 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -17,7 +17,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 0d49d05f636..0bcf5bc7894 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -38,7 +38,6 @@ PushSupplier_impl::~PushSupplier_impl() int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) { - ACE_DEBUG((LM_DEBUG, "for_suppliers\n")); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = channel->for_suppliers(); @@ -80,7 +79,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) void PushSupplier_impl::disconnect_push_supplier ( ) { - reactor_task_.reactor_->end_reactor_event_loop(); PortableServer::Current_var current = diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index e2984787fe3..c824b918e68 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -109,7 +109,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 9e6bfdb4d0f..1f516996caa 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -85,7 +85,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n" "Testing proper exception handling ...\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index d3a610e2e6c..420120eb148 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -36,7 +36,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp index 197bb9e42d3..f6d64472876 100644 --- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp @@ -36,7 +36,6 @@ Server_i::Server_i (void) Server_i::~Server_i() { - this->root_poa_->destroy(1, 1); this->orb_->destroy(); } diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp index b031edd1531..3d997aea380 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp @@ -101,7 +101,6 @@ public: virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->pic_.in())) { ACE_GUARD (TAO_SYNCH_MUTEX, g, this->lock_); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp index 4b9fb0827fd..7269ac7ff9a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp @@ -70,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } try { - if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index 7f093b9d1ef..66f9c2f6b73 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -9,7 +9,6 @@ using namespace CORBA; int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ORB_var orb = ORB_init(argc, argv); Object_var obj = orb->resolve_initial_references("Test"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp index a3c15776a31..1be39a461dd 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp @@ -39,7 +39,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp index 169226cdfe2..fb5f5bee9f9 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp @@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } else { - CORBA::String_var the_string = goodday->get_string (); diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index 4cb54504f8b..ccf070a7291 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -19,7 +19,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { - NContextExt_Client_i client; if (client.init (argc, argv) != 0) diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 0afb62d3c28..adc5d7eab45 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -36,7 +36,6 @@ NContextExt_Client_i::~NContextExt_Client_i (void) int NContextExt_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs")); int c; @@ -71,7 +70,6 @@ NContextExt_Client_i::parse_args (void) char * NContextExt_Client_i::get_name () { - // USe time (NULL) to produce the seed: ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0))); @@ -82,7 +80,6 @@ NContextExt_Client_i::get_name () for (int i = 0; i < len; ++i) { - int rand_value = ACE_OS::rand () % 10; switch (rand_value) @@ -143,7 +140,6 @@ NContextExt_Client_i::get_name () int NContextExt_Client_i::run (void) { - try { CosNaming::Name name; @@ -290,7 +286,6 @@ NContextExt_Client_i::print_values (CosNaming::Name name, CORBA::String_var obj_name, CORBA::String_var url_string) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %C,") ACE_TEXT ("The first component kind is %C,") ACE_TEXT ("The second component id is %C,") diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index ebf8f240a05..02f2196c4a5 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -26,7 +26,6 @@ */ class NContextExt_Client_i { - public: // = COnstructor and destructor. NContextExt_Client_i (void); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h index 6808fa640d1..382eed19e12 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h @@ -19,7 +19,6 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; }; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h index 6808fa640d1..382eed19e12 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h @@ -19,7 +19,6 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; }; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 370cffe3c23..466a680e1df 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -60,7 +60,6 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) int BasicLog_Test::init_factory (void) { - // Assumpting INS for finding LogServie //CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory", @@ -113,7 +112,6 @@ BasicLog_Test::init_factory (void) int BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize) { - try { DsLogAdmin::LogId id; @@ -319,7 +317,6 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) int BasicLog_Test::test_adminState() { - basicLog_->set_administrative_state(DsLogAdmin::locked); try { @@ -358,7 +355,6 @@ BasicLog_Test::test_adminState() int BasicLog_Test::test_logSize (void) { - try { basicLog_->set_max_size (1); @@ -401,7 +397,6 @@ BasicLog_Test::test_logSize (void) int BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy) { - CORBA::ULongLong old_n_records = basicLog_->get_n_records (); if (old_n_records <= 0) { @@ -555,7 +550,6 @@ BasicLog_Test::destroy_log() int BasicLog_Test::test_log_destroy (void) { - ACE_DEBUG ((LM_ERROR, "Testing destroy log\n")); this->basicLog_->destroy (); @@ -648,7 +642,6 @@ return 0; int BasicLog_Test::test_capacity_alarm_threshold (void) { - //basicLog_->set_log_full_action(DsLogAdmin::halt); DsLogAdmin::CapacityAlarmThresholdList list; diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 3914607b1bf..576b48e80ba 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -47,7 +47,6 @@ protected: */ class AdminProperties_Task : public ACE_Task_Base { - public: /// Constructor. AdminProperties_Task (void); @@ -83,7 +82,6 @@ private: */ class AdminProperties : public Notify_Test_Client { - friend class AdminProperties_StructuredPushConsumer; friend class AdminProperties_Task; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index 35d06b5d5f9..f772230f01b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -62,7 +62,6 @@ MultiTypes::MultiTypes (void) seq_event_count_ (0), disconnect_on_last_event_ (0) { - } MultiTypes::~MultiTypes () diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 27ef659b602..9ae43cd8654 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -50,7 +50,6 @@ get_event_channel(CORBA::ORB_ptr orb) if( channelIdSeq->length() == 0 ) { - try { ec = factory->create_channel( init_qos, init_admin, id); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp index e48a65eba34..6a7051d8fe1 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp @@ -85,7 +85,6 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'o': ior_output_file = get_opts.optarg; break; diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 827a2a95461..2224260849d 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -279,7 +279,6 @@ MonitorTestInterface_i::stat_dump (const char * statName) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception (statName); } } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index e67251706c4..b6583729658 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1678,7 +1678,6 @@ Consumer_Main::init_any_proxy_supplier (void) int Consumer_Main::fini (void) { - this->reconnection_callback_.fini (); if (this->disconnect_on_exit_) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index ea591edbf60..c94aaef6509 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -366,7 +366,6 @@ int Supplier_Main::init (int argc, ACE_TCHAR *argv[]) } case MODE_ANY: { - init_any_proxy_consumer (); break; } diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index c80efafa937..d687432802d 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -296,7 +296,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) if (pass2) { - // Create a new ecf, which should load itself from loadtest.xml CosNotifyChannelAdmin::EventChannelFactory_var cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ()); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 7579b33c5c1..1fcdeaa6a64 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -66,7 +66,6 @@ private: */ class RedGreen_Test { - public: // = Initialization RedGreen_Test (void); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 5fbc76eb76d..53fa04b748d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -440,7 +440,6 @@ else void Notify_Throughput::run_test (void) { - ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ," "burst_count_ %d, " "burst_pause_ %d, " diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index a4431f432f1..9641e4f164f 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -650,7 +650,6 @@ Client::test_get_property_value (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { Client client; diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 02fb01d1f4e..7b73e2d140b 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -18,7 +18,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index cc3033c6037..f79a12c7ecf 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { ACE_CString env ("SSL_CERT_FILE="); @@ -117,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (call_shutdown) { - // Let other clients to finish their task if any ACE_OS::sleep (wait_time); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 2bc01f9b689..e8c9238936c 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { ACE_CString env ("SSL_CERT_FILE="); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index a44b4fe03df..6f2713ef5f3 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -7,7 +7,6 @@ void Simple_Server_i::send_line (const char *) { - /* static unsigned long count = 0; diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp index 58430f8754a..d3840afb384 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp index fcc3766bfbf..d44c009f95d 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp @@ -34,7 +34,6 @@ Client_Worker::validate_connection (void) int Client_Worker::svc (void) { - try { // Validate connections befire doing any actual work.. diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h index cb0856a959a..011ef349b52 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h @@ -30,7 +30,6 @@ */ class Client_Worker : public ACE_Task_Base { - public: /// ctor Client_Worker (Simple_Server_ptr server, int niterations); diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index d274c19202e..07bf6504936 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -16,7 +16,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'k': ior = get_opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp index 3f01c998b92..8dc48e6da45 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp @@ -36,7 +36,6 @@ Client_Worker::validate_connection (void) int Client_Worker::svc (void) { - try { // Validate connections befire doing any actual work.. diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index af5644efc9e..58dae974023 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -30,7 +30,6 @@ */ class Client_Worker : public ACE_Task_Base { - public: /// ctor Client_Worker (Simple_Server_ptr server, diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index a20b3a72666..553c898e047 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -18,7 +18,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'k': ior = get_opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 8af167272d3..46cdc01bc6c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -30,7 +30,6 @@ */ class Naming_Test { - public: /// Execute the test code. <root_context> is the context to assume /// as the root for all tests operations. diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index dc8cba68341..e3c0c431e8c 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -30,7 +30,6 @@ */ class Naming_Test { - public: /// Execute the test code. <root_context> is the context to assume /// as the root for all tests operations. diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 2f26da216b9..da30b07966e 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -290,7 +290,6 @@ Client_i::~Client_i (void) int Client_i::obtain_initial_references (void) { - try { // Initialize the naming services. diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 759242b978f..cf1be253d99 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -15,7 +15,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { IOR_corbaname_Client_i client; diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index 17faa76b29d..0518dd80ef6 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -30,7 +30,6 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void) int IOR_corbaname_Client_i::run (void) { - try { CosNaming::Name name (1); diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index cc1c1da03bf..6cbfc28dc7d 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -26,7 +26,6 @@ */ class IOR_corbaname_Client_i { - public: // = Constructor and destructor. IOR_corbaname_Client_i (void); |