diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/data.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/data.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 206e24d7cb6..786295d28b8 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -36,9 +36,8 @@ Data::Data (CORBA::ORB_var orb) m_wchar1 (666), m_wchar2 (0), orb_ (orb) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { m_shortseq1.length (3UL); m_shortseq1[0UL] = 0; @@ -66,8 +65,7 @@ Data::Data (CORBA::ORB_var orb) // Getting the RootPOA so we can generate object references. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (obj.in ())) @@ -78,33 +76,27 @@ Data::Data (CORBA::ORB_var orb) // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); // Generate values for the member variables. this->m_objref1 = - root_poa->create_reference ("foo" - ACE_ENV_ARG_PARAMETER); + root_poa->create_reference ("foo"); this->m_objref2 = - root_poa->create_reference ("foo" - ACE_ENV_ARG_PARAMETER); + root_poa->create_reference ("foo"); // Clean up after the POA root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in ORB/POA init\n"); + ex._tao_print_exception ("Exception in ORB/POA init\n"); } - ACE_ENDTRY; } Data::~Data (void) |