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

7 files changed, 17 insertions, 35 deletions

diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index ab94a8760c1..a45f1e18fb9 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -76,7 +76,6 @@ Grid_Client_i::run (const char *name,
       Grid_ptr grid = client->make_grid (width_,
                                          height_
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
@@ -92,7 +91,6 @@ Grid_Client_i::run (const char *name,
                          ctr,
                          (value_ + ctr)
                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
 
             }
         }
@@ -100,11 +98,9 @@ Grid_Client_i::run (const char *name,
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Setting a value for the grid\n"));
 
-      ACE_TRY_CHECK;
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->shutdown ();
       }
 
     }
@@ -121,7 +117,6 @@ Grid_Client_i::run (const char *name,
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index fcec899cc6e..eeac3276ed9 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -95,14 +95,14 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::width (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::height (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
@@ -204,7 +204,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   grid_ptr->set_pool (pool_t_);
 
   // Register the Grid pointer.
-  return grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return grid_ptr->_this ();
 }
 
 // Set the ORB pointer.
@@ -217,7 +217,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -229,7 +229,7 @@ Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Grid_Factory_i::cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::cleanup (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 9545672721b..b19edb19238 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -47,7 +47,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
@@ -98,11 +98,11 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short height (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
@@ -131,7 +131,7 @@ public:
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the grid.
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index b3b5b0dfd7e..9cbc3ddfd00 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -66,7 +66,6 @@ Persistent_Client_i::run (const char *name,
       Grid_ptr grid = client->make_grid (width_,
                                          height_
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
@@ -79,7 +78,6 @@ Persistent_Client_i::run (const char *name,
               CORBA::Long ret_val = grid->get (index_,
                                                ctr
                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
                           "Grid value [%d][%d] =  %d \n",index_, ctr,ret_val));
@@ -87,13 +85,11 @@ Persistent_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->shutdown ();
       }
 
       if (this->remove_ == 1) {
-        client->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->cleanup ();
       }
     }
   ACE_CATCH (CORBA::UserException, range_ex)
@@ -109,7 +105,6 @@ Persistent_Client_i::run (const char *name,
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index b69f2e4f6f8..0af289aa951 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -86,7 +86,6 @@ Server<Servant>::init (const char *servant_name,
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -114,7 +113,6 @@ Server<Servant>::init (const char *servant_name,
         this->orb_manager_.activate_under_child_poa (servant_name,
                                                      &this->servant_
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -136,17 +134,15 @@ Server<Servant>::init (const char *servant_name,
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 template <class Servant> int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ret = this->orb_manager_.run ();
 
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -258,7 +254,6 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
                                     this->argv_,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -268,7 +263,6 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
         {
           CORBA::Object_var server_object =
             this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -278,7 +272,6 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
                               -1);
           this->server_ = InterfaceObj::_narrow (server_object.in ()
                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index c5bcc8fa47a..d91f700d77e 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -55,7 +55,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
  protected:
@@ -120,7 +120,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int obtain_initial_references (void);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 99f007eae7f..13c0324a1a0 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -24,8 +24,7 @@ main (int argc, char *argv[])
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
   ACE_CATCH (CORBA::UserException, userex)