1 files changed, 10 insertions, 18 deletions

diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index f01b5c7570d..bd40514f42b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -21,20 +21,17 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
 
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->client_setup();
 
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->run_engine();
 
   this->cleanup();
   return result;
@@ -42,10 +39,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -56,13 +52,11 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo obj ref.
   Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
-                                              this->ior_.c_str()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              this->ior_.c_str());
 
   // Create the ClientEngine object, and give it the Foo obj ref.
   this->engine_ = new Foo_ClientEngine(foo.in(), this->client_id_);
@@ -70,11 +64,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_engine(void)
 {
-  bool result = this->engine_->execute(this->num_loops_ 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  bool result = this->engine_->execute(this->num_loops_);
   return result ? 0 : -1;
 }