1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index b0a187d4c7e..6b307072ec3 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -35,47 +35,47 @@ public:
   // Constructor
 
   Grid_i (CORBA::Short,
-          CORBA::Short,
-          CORBA_Environment &);
+          CORBA::Short
+          TAO_ENV_ARG_DECL_NOT_USED);
   // Constructor.
 
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (CORBA_Environment &)
+  virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (CORBA_Environment &)
+  virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short,
-                      CORBA_Environment &)
+  virtual void width (CORBA::Short
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short,
-                       CORBA_Environment &)
+  virtual void height (CORBA::Short
+                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long,
-                    CORBA::Environment &)
+                    CORBA::Long
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short,
-                           CORBA::Environment &)
+                           CORBA::Short
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Destroy the grid.
@@ -107,12 +107,12 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short,
-                              CORBA::Environment &_env)
+                              CORBA::Short
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.