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

1 files changed, 2 insertions, 5 deletions

diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index bfa97ea05a1..17ab0efef4f 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -13,28 +13,25 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 Test::HelloWorld_ptr
-Hello::get_helloworld (ACE_ENV_SINGLE_ARG_DECL)
+Hello::get_helloworld (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   HelloWorld *hello_world;
   ACE_NEW_THROW_EX (hello_world,
           HelloWorld,
 		    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::HelloWorld::_nil ());
 
   PortableServer::ObjectId_var oid =
     poa_->activate_object (hello_world
                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Test::HelloWorld::_nil ());
 
   Test::HelloWorld_var hw = hello_world->_this ();
   return hw._retn ();
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }