diff options
Diffstat (limited to 'TAO/tests/POA')
11 files changed, 11 insertions, 15 deletions
diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp index a1aef31be38..c875f45768d 100644 --- a/TAO/tests/POA/Bug_1592_Regression/server.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/server.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp index 37425ab21fd..e73f8c5fd88 100644 --- a/TAO/tests/POA/EndpointPolicy/server.cpp +++ b/TAO/tests/POA/EndpointPolicy/server.cpp @@ -347,7 +347,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } try { - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 4a099a65fd1..349810d7917 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -546,8 +546,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) forth_poa.in (), perform_deactivation_test); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 2af32ba3983..52ca11fa5b9 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -300,8 +300,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) first_task.wait (); second_task.wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 7aefcc52e47..5dc52e199fa 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -247,8 +247,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Wait for the Object_Activator thread to exit. thread_manager.wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index f2da5f47bfe..f3958139f0c 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -93,7 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) root_poa->deactivate_object (id2.in ()); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index de40e09f58e..979a9efe3aa 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -271,8 +271,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (result != 0) return result; - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index b5fb97379ad..98fb48a9442 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -255,7 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager_1->activate (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 85578e2ed8a..d86e66c9e3f 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -178,7 +178,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // In non-debug compiles, asserts will disappear. ACE_UNUSED_ARG (result); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/TIE/server.cpp b/TAO/tests/POA/TIE/server.cpp index 2021a022247..a8611154317 100644 --- a/TAO/tests/POA/TIE/server.cpp +++ b/TAO/tests/POA/TIE/server.cpp @@ -263,7 +263,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 77a79ff11d9..c93b7869de2 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -124,7 +124,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_object->destroy_poa (); - first_poa->destroy (1, 1); + first_poa->destroy (true, true); orb1->destroy (); orb2->destroy (); |