ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 12 insertions, 24 deletions

diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 5a6033aad73..fd0ab4097dd 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -68,8 +68,7 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
-                                                    ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -78,14 +77,12 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_round_robin (const char *id
-                           ACE_ENV_ARG_DECL)
+  void unbind_round_robin (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id
-                                               ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -94,13 +91,11 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_random (const char *id
-                      ACE_ENV_ARG_DECL)
+  void unbind_random (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id
-                                           ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr resolve (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
@@ -132,23 +127,20 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id
-                                              ACE_ENV_ARG_DECL)
+                                              const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
 
-  Load_Balancer::Group_List * list_groups (int random
-                                           ACE_ENV_ARG_DECL);
+  Load_Balancer::Group_List * list_groups (int random);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
   // round robin groups if it is 0.
 
-  void update_flags (int random
-                     ACE_ENV_ARG_DECL);
+  void update_flags (int random);
   // The helper that updates the vlaue of the variable flags_
 
   void update_objects (void);
@@ -215,8 +207,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member
-             ACE_ENV_ARG_DECL)
+  void bind (const Load_Balancer::Member & member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -224,8 +215,7 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
@@ -240,8 +230,7 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  char * resolve_with_id (const char * id
-                          ACE_ENV_ARG_DECL)
+  char * resolve_with_id (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
@@ -324,8 +313,7 @@ public:
                    PortableServer::POA_ptr poa);
   // Constructor.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from