1 files changed, 19 insertions, 20 deletions

diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 26c346bd2e3..56dc3177fe7 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -16,8 +16,8 @@ Grid_i::Grid_i (void)
 //  Constructor.
 
 Grid_i::Grid_i (CORBA::Short x,
-                CORBA::Short y,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Short y
+                TAO_ENV_ARG_DECL)
   : width_ (x),
     height_ (y)
 {
@@ -49,9 +49,9 @@ Grid_i::~Grid_i (void)
 
 void
 Grid_i::set (CORBA::Short x,
-	     CORBA::Short y,
-	     CORBA::Long value,
-	     CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Short y,
+             CORBA::Long value
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -68,8 +68,8 @@ Grid_i::set (CORBA::Short x,
 
 CORBA::Long
 Grid_i::get (CORBA::Short x,
-             CORBA::Short y,
-             CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Short y
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -85,30 +85,30 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (CORBA::Environment &)
+Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (CORBA::Environment &)
+Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
-Grid_i::width (CORBA::Short x,
-	       CORBA::Environment &)
+Grid_i::width (CORBA::Short x
+               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
-Grid_i::height (CORBA::Short y,
-		CORBA::Environment &)
+Grid_i::height (CORBA::Short y
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -117,7 +117,7 @@ Grid_i::height (CORBA::Short y,
 // Destroy the grid
 
 void
-Grid_i::destroy (CORBA::Environment &)
+Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -143,7 +143,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 
 void
-Grid_Factory_i::shutdown (CORBA::Environment &)
+Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -180,8 +180,8 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
-                           CORBA::Short height,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Short height
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Grid_i *grid_ptr = 0;
@@ -199,14 +199,13 @@ Grid_Factory_i::make_grid (CORBA::Short width,
 
   // This attempts to create a new Grid_i and throws an exception and
   // returns a null value if it fails
-  CORBA::Environment &env =  ACE_TRY_ENV;
   ACE_NEW_THROW_EX (grid_ptr,
-                    Grid_i (width, height, env),
+                    Grid_i (width, height TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Grid::_nil ());
 
   // Register the Grid pointer.
-  Grid_ptr gptr = grid_ptr->_this (ACE_TRY_ENV);
+  Grid_ptr gptr = grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return gptr;
 }