diff options
Diffstat (limited to 'TAO/orbsvcs/examples')
58 files changed, 0 insertions, 87 deletions
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 4a6b0e23017..ef01d16308b 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,11 +3,9 @@ #include "CountryC.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization boiler plate... @@ -69,4 +67,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h index 6582df0c2d7..165f126b4f7 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h @@ -11,7 +11,6 @@ class ORB_Initializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index f2fbc5e6f7f..0681024f2f9 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -63,7 +63,6 @@ associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state) pic->set_slot (state_slot_id (), state); - } catch (const CORBA::Exception& ex) { @@ -492,7 +491,6 @@ void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index 5aa00ad9d8d..1d6b81b6ac7 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -74,7 +74,6 @@ private: resolve_poa (PortableInterceptor::AdapterName const& name); private: - class RecordId { public: diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 051e09989a5..a13dffdb184 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ())); iors [cntr] = orb->string_to_object (ior->c_str()); - } ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n")); @@ -127,7 +126,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) object = iorm->merge_iors (iors); - FT::TagFTGroupTaggedComponent ft_tag_component; // Property values diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h index b1824922771..ca1e362a95c 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h @@ -23,7 +23,6 @@ public: virtual CORBA::Long endRetry (); private: - long server_instance_; long retry_count_; long retry_attempt_; diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 28543b33482..e9e5ff59a93 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -134,7 +134,6 @@ void TestClient::run() this->wait(); ACE_DEBUG((LM_DEBUG, "* Client ended.\n")); - } // Read in the stringified object references into an array diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 995ef08cb47..147fb42f0e8 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); @@ -70,7 +69,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("Combined Service:"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 048c040e03b..8cf2c96d7fe 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"); @@ -110,7 +109,6 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) runner_->activate(); ACE_DEBUG((LM_DEBUG, "dynserver: running.\n")); - } catch (Exception& e) { e._tao_print_exception ("DynServer::init()"); } @@ -122,7 +120,6 @@ DynServer_Loader::fini (void) { ACE_ASSERT(runner_.get() != 0); try { - ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n")); runner_->end(); @@ -134,7 +131,6 @@ DynServer_Loader::fini (void) ACE_DEBUG((LM_DEBUG, "dynserver: shut down successfully.\n")); return 0; - } catch (Exception& e) { e._tao_print_exception ("DynServer::fini()"); } 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/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index e890ce2cc25..c270870f635 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -83,7 +83,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { root_poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("TestServer::init()"); } 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 009117f7ac1..e24f5c1f2f3 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -33,7 +33,6 @@ class RPS_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor RPS_Monitor (ServerRequestInterceptor * interceptor); @@ -43,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. @@ -62,7 +60,6 @@ public: //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -71,7 +68,6 @@ protected: ~RPS_Monitor (void); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 4902f70300f..f0550d67bb8 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -9,7 +9,6 @@ #define QUERY_LANG "TCL" - TLS_Client::TLS_Client (void) { // No-Op. diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index 729b414a5a1..dea614b2c50 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -53,6 +53,5 @@ class TLS_Client // The basic log factory from the Log Service. - }; #endif /* TLS_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index bc3aa1ea8ea..9bce68a2b19 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -90,13 +90,11 @@ Consumer::run (int argc, ACE_TCHAR* argv[]) void Consumer::push (const CORBA::Any &) { - this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): %d log generated events received\n", this->event_count_)); - } void diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 1117e907a81..e23c33959b3 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -45,7 +45,6 @@ public: // The skeleton methods. private: - // = Data Members CORBA::ULong event_count_; // Keep track of the number of events received. @@ -62,7 +61,6 @@ private: CosEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* EVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 80d40ebf367..13d885b60db 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -165,7 +165,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index 4296b533ac7..6b2d7a484d3 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -42,7 +42,6 @@ public: // The skeleton methods. private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. @@ -55,7 +54,6 @@ private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_; // The proxy that we are connected to. - }; #endif /* EVENT_SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 4357cc56362..805a9900f3e 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -71,8 +71,6 @@ private: DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_; CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; - - }; #endif /* NOTIFY_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 7040112fe63..5d5dfad91bd 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 @@ -41,7 +40,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) CORBA::ORB_init (argc, argv); - CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -221,7 +219,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval)); this->notify_log_->destroy(); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index f2557c33a17..3324eced5e2 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -44,7 +44,6 @@ public: // Run the test private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index acaba8da10d..6ebec884016 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -60,7 +60,6 @@ private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* RTEVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index b7e4f09ed25..653890485d1 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -17,7 +17,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Supplier supplier; return supplier.run (argc, argv); - } // **************************************************************** @@ -93,7 +92,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) - // create a log.. ACE_DEBUG ((LM_DEBUG, @@ -212,8 +210,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 426e5225dca..20de42fc970 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -43,7 +43,6 @@ public: // The skeleton methods. private: - // = Data Members CosNaming::NamingContext_var naming_context_; // Handle to the name service. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 627d28c99e1..a61c03e454f 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -190,7 +190,6 @@ private: ProxyID supplier_id_; StructuredProxyPushSupplier_var 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/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 285db7c8a01..786c1029bc9 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , lane_priority_ (0) @@ -181,7 +180,6 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 3651c9fd1ef..8bab425bc0f 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 32865fcd20c..12f60304909 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) ,supplier_ (0) @@ -187,7 +186,6 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a6f96cbe249..93cd4e1f219 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -329,7 +329,6 @@ Subscribe_StructuredPushConsumer::push_structured_event if (++g_result_count == EVENT_COUNT) subscribe_->done (); - } void diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index d34251bb9b7..a61cbed6fe5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , consumer_ (0) @@ -185,7 +184,6 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index af8bf93d61b..416239c0e0e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_ThreadPool_Supplier::TAO_Notify_ThreadPool_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 8fe87a8af5e..6afd9723a61 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -183,7 +183,6 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h index 3a3889856df..27ba0514a18 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h @@ -14,7 +14,6 @@ class Gateway_ObjRef_Factory public virtual OBV_ORT::ObjectReferenceFactory { public: - Gateway_ObjRef_Factory ( Gateway::Object_Factory_ptr gateway_object_factory, PortableInterceptor::ObjectReferenceFactory *old_factory); diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 081dee4ed14..b375ea65a25 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -34,7 +34,6 @@ public: PortableServer::POA_ptr poa); private: - CORBA::ORB_ptr orb_; PortableServer::Current_ptr poa_current_; diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h index 80aaf03d774..fce4a82e0df 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h @@ -21,7 +21,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory { public: - /// Constructor Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa); @@ -31,7 +30,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory CORBA::Object_ptr gatewayed_object); private: - CORBA::ORB_ptr orb_; PortableServer::POA_ptr gateway_poa_; }; diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 47774c8921e..32748ae6eee 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -22,7 +22,6 @@ class Server_IORInterceptor public virtual ::CORBA::LocalObject { public: - Server_IORInterceptor (Gateway::Object_Factory_ptr gateway_object_factory); /** @@ -57,13 +56,10 @@ public: //@} protected: - ~Server_IORInterceptor (void); private: - Gateway::Object_Factory_ptr gateway_object_factory_; - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index 1832257174a..e5b4d270230 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -20,7 +20,6 @@ class Server_IORInterceptor_ORBInitializer public virtual ::CORBA::LocalObject { public: - //@{ /// The pre-initialization hook. virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -28,7 +27,6 @@ class Server_IORInterceptor_ORBInitializer /// The post-initialization hook. virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h index 730542b0aa4..b3bfb5c2d5f 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.h +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h @@ -21,14 +21,12 @@ class sum_server_i : public virtual POA_ORT::sum_server { public: - /// Constructor sum_server_i (); /// add variables method CORBA::Long add_variables (CORBA::Long a, CORBA::Long b); - }; #endif /* SUM_SERVER_I_H */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index 6affe0ce442..8ba0a0c792a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -1,7 +1,6 @@ #include "Consumer.h" - Consumer::Consumer (void) { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index d5294b91bec..5032ec9520a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -20,7 +20,6 @@ #include "ace/Thread.h" - namespace { int config_run = 0; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index a08693a781d..a62d2de04dd 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/RtecEventCommC.h" - Supplier::Supplier (RtecEventComm::EventSourceID id, const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy) :id_ (id), diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 09820b9d704..3afa9f99684 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_unistd.h" - int config_run = 0; int parse_args (int argc, ACE_TCHAR *argv[]); 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/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index e5c1b8615fd..67a9c41c128 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -26,7 +26,6 @@ class SLevel1_Server_i : public POA_SLevel1_Server static int authorized_1; static int authorized_2; - }; #endif /* TAO_SLEVEL1_TEST_I_H */ diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 66f5acd3b42..5e292c26972 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -1,7 +1,6 @@ #include "SLevel1_TestC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 07c950987ef..00090f0dbf6 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -49,7 +49,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (true, true); - } catch (const CORBA::SytemException& ) { diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index ab977303ded..68a578d17cc 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -3,7 +3,6 @@ #include "testC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 9b9f82aab2c..326958271d9 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 8f06732eb5c..3e2822e1927 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - void Simple_Server_i::send_line (const char *line) { |