1 files changed, 10 insertions, 22 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index f9e4ce24128..55b8f625fb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -21,44 +21,34 @@ TAO_RT_Notify_Service::~TAO_RT_Notify_Service ()
 }
 
 void
-TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n"));
 
-  this->init_i (orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_i (orb);
 }
 
 void
-TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb)
 {
   //Init the base class.
-  TAO_CosNotify_Service::init_i (orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_CosNotify_Service::init_i (orb);
 
   TAO_Notify_RT_Properties* properties = TAO_Notify_RT_PROPERTIES::instance();
 
   // Resolve RTORB
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTORB");
 
   RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve RTCurrent
   object =
-    orb->resolve_initial_references ("RTCurrent"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (object.in ());
 
  /// Set the properties
   properties->rt_orb (rt_orb.in ());
@@ -66,7 +56,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 TAO_Notify_Factory*
-TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_factory (void)
 {
   TAO_Notify_Factory* factory =
     ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
@@ -76,19 +66,17 @@ TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
       ACE_NEW_THROW_EX (factory,
                         TAO_Notify_RT_Factory (),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN(0);
     }
   return factory;
 }
 
 TAO_Notify_Builder*
-TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_builder (void)
 {
   TAO_Notify_Builder* builder = 0;
   ACE_NEW_THROW_EX (builder,
                     TAO_Notify_RT_Builder (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN(0);
 
   return builder;
 }