diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-09-15 16:00:48 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-09-15 16:00:48 +0200 |
| commit | 5385cbc61f1ce880b06abd2960265297753f53cc (patch) | |
| tree | 51ad9f0d9c7895f0a7dcd659b60c8f1c9711c94a | |
| parent | 87671627d5de5ed9c4a5dd06c4e1f7710ecba9eb (diff) | |
| download | ATCD-5385cbc61f1ce880b06abd2960265297753f53cc.tar.gz | |
Cleanup
* TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
* TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
* TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp:
* TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:
4 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 2ee9ffd3c7e..fe21ede6f1e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -23,8 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; TAO_IFR_Server::TAO_IFR_Server (void) - : //servant_locator_impl_ (0), - ior_multicast_ (0), + : ior_multicast_ (0), config_ (0) { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 3b3b127c888..8fb9f31fc59 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -55,7 +55,7 @@ public: PortableServer::POA_ptr rp, int use_multicast_server = 0); - /// Destroy the child POA created in <init_with_poa>. + /// Destroy the child POA created in init_with_poa(). int fini (void); /// Destructor. diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index d18b5883ec6..d954dbd5a98 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" - - Ptest::Ptest (void) : debug_ (0), query_ (0) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl index cdafdc04f59..f37a7c4382a 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl @@ -72,7 +72,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -print "Starting Persistence_Test\n"; +print "Starting Persistence_Test 1\n"; $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); @@ -122,7 +122,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -print "Starting Persistence_Test\n"; +print "Starting Persistence_Test 2\n"; $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); |