1 files changed, 14 insertions, 14 deletions

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index dd0e89cfc02..44177359cca 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -14,12 +14,12 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize ORB.
       CORBA::ORB_ptr orb = 
-	CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::POA_ptr poa =
 	orb->POA_init(argc, argv, "POA");
@@ -32,11 +32,11 @@ int main (int argc, char *argv[])
 
       CORBA::Object_ptr objref =
 	orb->resolve_initial_references ("NameService");
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
 
       CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+        CosNaming::NamingContext::_narrow (objref, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "got reference to NameService\n"));
 
@@ -46,28 +46,28 @@ int main (int argc, char *argv[])
       ACE_EventChannel* ec;
       ACE_NEW_RETURN (ec, ACE_EventChannel, -1);
       CORBA::Object::_duplicate(ec);
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
 
       CORBA::String str =
-	orb->object_to_string (ec, ACE_TRY_ENV);
+	orb->object_to_string (ec, TAO_TRY_ENV);
       ACE_OS::puts ((char *) str);
 
       CosNaming::Name channel_name (1);
       channel_name[0].id = CORBA::string_dup ("EventService");
       channel_name.length (1);
-      naming_context->bind (channel_name, ec, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
+      naming_context->bind (channel_name, ec, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       orb->run ();
 
       CORBA::release (ec);
-      ACE_CHECK_ENV;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("EC");
+      TAO_TRY_ENV.print_exception ("EC");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 
   return 0;