Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 4 insertions, 9 deletions

diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index 7e876ea57c8..e9694858821 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -13,7 +13,7 @@ bogus::~bogus()
 }
 
 void
-bogus::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+bogus::noop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index 94a4961f8ff..dceebf65eb0 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -15,7 +15,7 @@ public:
   bogus ();
   virtual ~bogus ();
 
-  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void noop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index b4058e4deef..1acd35bbb9e 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -17,28 +17,23 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var rp =
         PortableServer::POA::_narrow(poa_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if  (CORBA::is_nil (rp.in()))
         ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) panic: nil root poa\n"), 1);
 
       bogus* bogus_impl = new bogus();
       PortableServer::ServantBase_var owner_transfer(bogus_impl);
-      Test::bogus_var b = bogus_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::bogus_var b = bogus_impl->_this();
       CORBA::String_var ior =
         orb->object_to_string (b.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       printf ("%s\n", ior.in());
-  
+
       orb->shutdown();
       orb->destroy();
     }