ChangeLogTag:Thu Jun 24 20:02:24 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

8 files changed, 74 insertions, 60 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index d23c8ea674d..3ba94467257 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -2,9 +2,20 @@ Thu Jun 24 20:02:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
 	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp:
 	  The IDL compiler was not generating exception safe code in a
 	  couple of places.
 
+	* tao/poa_macros.h:
+	* tao/Object_Adapter.i:
+	* tao/POA.cpp:
+	* tao/POA.i:
+	* tao/POAManager.i:
+	  The POA was implicitly using the obsolete TAO_TRY macros through 
+	  its TAO_POA_GUARD_* stuff, updated to use ACE_GUARD_* and
+	  friends.
+
 Thu Jun 24 17:48:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* docs/releasenotes/TODO.html (pseudo-object): Added a todo item
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 058f7ad1908..2abc4ef0f98 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -15,7 +15,7 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>  
+//    <alex@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -42,7 +42,7 @@ be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
 }
 
 // Processing to be done after every element in the scope is
-// processed.  
+// processed.
 int
 be_visitor_operation_ami_cs::post_process (be_decl *bd)
 {
@@ -65,13 +65,13 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   os->indent (); // start with the current indentation level
 
-  // Generate the return type mapping. Return type is simply void. 
+  // Generate the return type mapping. Return type is simply void.
   *os << "void" << be_nl;
-  
+
   // Generate the operation name.
 
   // Grab the scope name.
-  be_decl *parent = 
+  be_decl *parent =
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
   if (parent == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                        "visit_operation - "
                        "scope name is nil\n"),
                       -1);
-  
+
   // Generate the scope::operation name.
   *os << parent->fullname ()
       << "::"
@@ -107,7 +107,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
-  // Create the return type node. Return type is void. 
+  // Create the return type node. Return type is void.
   be_predefined_type *bt = 0;
   ACE_NEW_RETURN (bt,
                   be_predefined_type (AST_PredefinedType::PT_void,
@@ -667,8 +667,8 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  *os << "ACE_TRY_ENV.clear ();" << be_nl
-      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  // *os << "ACE_TRY_ENV.clear ();" << be_nl
+  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
   // check if there is an exception
   if (this->gen_check_exception (bt) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
index b8f6978e4f3..9db88553f3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
@@ -15,7 +15,7 @@
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>  
+//    <alex@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -42,7 +42,7 @@ be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
 }
 
 // Processing to be done after every element in the scope is
-// processed.  
+// processed.
 int
 be_visitor_operation_ami_cs::post_process (be_decl *bd)
 {
@@ -65,13 +65,13 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   os->indent (); // start with the current indentation level
 
-  // Generate the return type mapping. Return type is simply void. 
+  // Generate the return type mapping. Return type is simply void.
   *os << "void" << be_nl;
-  
+
   // Generate the operation name.
 
   // Grab the scope name.
-  be_decl *parent = 
+  be_decl *parent =
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
   if (parent == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
                        "visit_operation - "
                        "scope name is nil\n"),
                       -1);
-  
+
   // Generate the scope::operation name.
   *os << parent->fullname ()
       << "::"
@@ -107,7 +107,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
-  // Create the return type node. Return type is void. 
+  // Create the return type node. Return type is void.
   be_predefined_type *bt = 0;
   ACE_NEW_RETURN (bt,
                   be_predefined_type (AST_PredefinedType::PT_void,
@@ -667,8 +667,8 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  *os << "ACE_TRY_ENV.clear ();" << be_nl
-      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  // *os << "ACE_TRY_ENV.clear ();" << be_nl
+  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
   // check if there is an exception
   if (this->gen_check_exception (bt) == -1)
     {
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i
index c41ba8ce421..3244fe3f842 100644
--- a/TAO/tao/Object_Adapter.i
+++ b/TAO/tao/Object_Adapter.i
@@ -36,7 +36,7 @@ TAO_Object_Adapter::deactivate (CORBA::Boolean wait_for_completion,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->deactivate_i (wait_for_completion,
                       ACE_TRY_ENV);
@@ -47,7 +47,7 @@ TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1);
 
   return this->locate_servant_i (key,
                                  ACE_TRY_ENV);
@@ -58,7 +58,7 @@ TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->find_servant_i (key,
                                ACE_TRY_ENV);
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 6effd25b9ec..140b28b2b1e 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -279,7 +279,7 @@ TAO_POA::find_POA (const char *adapter_name,
                    CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   // A recursive thread lock without using a recursive thread
   // lock.  Non_Servant_Upcall has a magic constructor and
@@ -1311,7 +1311,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
         }
 
       // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
       // Find user id from system id.
       PortableServer::ObjectId user_id;
@@ -1363,7 +1363,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
       // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
       PortableServer::Servant result = this->default_servant_.in ();
       if (result != 0)
@@ -1439,7 +1439,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
     }
 
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   // The object denoted by the reference does not have to be active
   // for this operation to succeed.
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index c32277a110b..ce527e6d073 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -215,7 +215,7 @@ TAO_POA::create_POA (const char *adapter_name,
                      CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->create_POA_i (adapter_name,
                              poa_manager,
@@ -229,7 +229,7 @@ TAO_POA::destroy (CORBA::Boolean etherealize_objects,
                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->destroy_i (etherealize_objects,
                    wait_for_completion,
@@ -254,7 +254,7 @@ ACE_INLINE PortableServer::ServantManager_ptr
 TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil (), ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil ());
 
   return this->get_servant_manager_i (ACE_TRY_ENV);
 }
@@ -264,7 +264,7 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
                               CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->set_servant_manager_i (imgr,
                                ACE_TRY_ENV);
@@ -274,7 +274,7 @@ ACE_INLINE PortableServer::Servant
 TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->get_servant_i (ACE_TRY_ENV);
 }
@@ -284,7 +284,7 @@ TAO_POA::set_servant (PortableServer::Servant servant,
                       CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->set_servant_i (servant,
                        ACE_TRY_ENV);
@@ -297,7 +297,7 @@ TAO_POA::activate_object (PortableServer::Servant servant,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->activate_object_i (servant,
                                   ACE_TRY_ENV);
@@ -309,7 +309,7 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->activate_object_with_id_i (id,
                                    servant,
@@ -321,7 +321,7 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
                             CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->deactivate_object_i (oid,
                              ACE_TRY_ENV);
@@ -332,7 +332,7 @@ TAO_POA::create_reference (const char *intf,
                            CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
 
   return this->create_reference_i (intf,
                                    ACE_TRY_ENV);
@@ -344,7 +344,7 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
 
   return this->create_reference_with_id_i (id,
                                            intf,
@@ -358,7 +358,7 @@ TAO_POA::servant_to_id (PortableServer::Servant servant,
   // If we had upgradeable locks, this would initially be a read lock
   //
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->servant_to_id_i (servant,
                                 ACE_TRY_ENV);
@@ -369,7 +369,7 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->servant_to_system_id_i (servant,
                                        ACE_TRY_ENV);
@@ -380,7 +380,7 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->id_to_servant_i (oid,
                                 ACE_TRY_ENV);
@@ -391,7 +391,7 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
 
   return this->id_to_reference_i (oid, ACE_TRY_ENV);
 }
@@ -404,7 +404,7 @@ TAO_POA::forward_object (const PortableServer::ObjectId &oid,
                          CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->forward_object_i (oid,
                           forward_to,
@@ -434,7 +434,7 @@ ACE_INLINE PortableServer::AdapterActivator_ptr
 TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil (), ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil ());
 
   return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
 }
@@ -444,7 +444,7 @@ TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
 }
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
index c8ce24fe58a..28e8acbd991 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/POAManager.i
@@ -12,7 +12,7 @@ ACE_INLINE void
 TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->activate_i (ACE_TRY_ENV);
 }
@@ -24,7 +24,7 @@ TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
                                 CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -34,7 +34,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
                                    CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
 }
@@ -45,7 +45,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA_Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
 
   this->deactivate_i (etherealize_objects,
                       wait_for_completion,
@@ -64,7 +64,7 @@ ACE_INLINE PortableServer::POAManager::State
 TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
 {
   // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_, ACE_TRY_ENV);
+  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_);
 
   return this->get_state_i ();
 }
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
index 46b6d0ca3a7..b08756fd619 100644
--- a/TAO/tao/poa_macros.h
+++ b/TAO/tao/poa_macros.h
@@ -7,22 +7,25 @@
 
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
-#define TAO_POA_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_GUARD(MUTEX,OBJ,LOCK) \
+  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
+  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
+  ACE_CHECK_RETURN (RETURN)
 
-#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_WRITE_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK) \
+  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK) \
+  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
 
-#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_WRITE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK) \
+  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
+  ACE_CHECK_RETURN (RETURN)
 
-#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK) \
+  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
+  ACE_CHECK_RETURN (RETURN)
 
 #endif /* TAO_POA_MACROS_H */