1 files changed, 12 insertions, 15 deletions
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
index b08756fd619..46b6d0ca3a7 100644
--- a/TAO/tao/poa_macros.h
+++ b/TAO/tao/poa_macros.h
@@ -7,25 +7,22 @@
 
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
-#define TAO_POA_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
+#define TAO_POA_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_GUARD_THROW(MUTEX,OBJ,LOCK,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_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,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_WRITE_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_WRITE_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_READ_GUARD(MUTEX,OBJ,LOCK,ENV) \
+  TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,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_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_WRITE_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)
+#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
+  TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
 
 #endif /* TAO_POA_MACROS_H */