diff options
Diffstat (limited to 'TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp')
| -rw-r--r-- | TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index b7efa50682b..6384013e7c6 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -9,7 +9,7 @@ // Object_B_i.cpp // // = DESCRIPTION -// This class implements the Object B of the +// This class implements the Object B of the // Nested Upcalls - Triangle test. // // = AUTHORS @@ -36,20 +36,20 @@ Object_B_i::~Object_B_i (void) void Object_B_i::foo (Object_A_ptr object_A_ptr, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo ()\n")); - ACE_TRY + TAO_TRY { - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n")); - object_A_ptr->finish (ACE_TRY_ENV); - ACE_TRY_CHECK; + object_A_ptr->finish (TAO_TRY_ENV); + TAO_CHECK_ENV; // Start to wait on this variable, it is set to true // by the method finish () @@ -59,12 +59,13 @@ Object_B_i::foo (Object_A_ptr object_A_ptr, ACE_OS::sleep(pause); } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator"); + TAO_TRY_ENV.print_exception ("calling the initiator"); } - ACE_ENDTRY; + TAO_ENDTRY; ACE_DEBUG ((LM_DEBUG, "(%P|%t) END Object_B_i::foo ()\n")); } + |