ChangeLogTag: Tue Nov 14 19:45:19 2000 Jeff Parsons <parsons@cs.wustl.edu>

3 files changed, 285 insertions, 143 deletions

diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 32ee26136f1..00a41f64f6f 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -3308,6 +3308,10 @@ SOURCE=.\CONV_FRAMES.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\CONV_FRAMES_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\corba.h

 # End Source File

 # Begin Source File

@@ -3412,6 +3416,10 @@ SOURCE=.\GIOP_Message_Base.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Message_Connectors.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_Headers.h

 # End Source File

 # Begin Source File

@@ -3432,6 +3440,10 @@ SOURCE=.\GIOPC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOPS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ifrfwd.h

 # End Source File

 # Begin Source File

@@ -3460,6 +3472,10 @@ SOURCE=.\IIOP_Factory.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IIOP_Lite_Factory.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IIOP_Profile.h

 # End Source File

 # Begin Source File

@@ -3492,6 +3508,18 @@ SOURCE=.\IOPS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOPS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ior_corbaloc_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ior_corbaname_export.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IOR_Parser.h

 # End Source File

 # Begin Source File

@@ -3572,6 +3600,10 @@ SOURCE=.\OctetSeqC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\operation_details.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\orb.h

 # End Source File

 # Begin Source File

@@ -3612,6 +3644,14 @@ SOURCE=.\Pluggable.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pluggable_Messaging.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pluggable_Messaging_Utils.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Policy_Manager.h

 # End Source File

 # Begin Source File

@@ -3632,6 +3672,10 @@ SOURCE=.\PollableS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.h

 # End Source File

 # Begin Source File

@@ -3808,6 +3852,10 @@ SOURCE=.\TAOS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\TAOS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\target_specification.h

 # End Source File

 # Begin Source File

@@ -3816,6 +3864,14 @@ SOURCE=.\TimeBaseC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\TimeBaseS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timeprobe.h

 # End Source File

 # Begin Source File

@@ -3824,6 +3880,10 @@ SOURCE=.\Transport_Mux_Strategy.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\try_macros.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\typecode.h

 # End Source File

 # Begin Source File

@@ -3876,10 +3936,6 @@ SOURCE=.\Acceptor_Registry.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Adapter.i

 # End Source File

 # Begin Source File

@@ -3932,15 +3988,15 @@ SOURCE=.\Connection_Handler.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.i

+SOURCE=.\CONV_FRAMEC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

+SOURCE=.\CONV_FRAMES.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.i

+SOURCE=.\CONV_FRAMES_T.i

 # End Source File

 # Begin Source File

 

@@ -3976,10 +4032,6 @@ SOURCE=.\default_server.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DLL_ORB.inl

 # End Source File

 # Begin Source File

@@ -3992,10 +4044,6 @@ SOURCE=.\DomainC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynamicC.i

 # End Source File

 # Begin Source File

@@ -4060,6 +4108,18 @@ SOURCE=.\GIOPC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOPS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOPS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\IIOP_Acceptor.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IIOP_Connect.i

 # End Source File

 # Begin Source File

@@ -4072,7 +4132,11 @@ SOURCE=.\iiop_endpoints.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_ORB.i

+SOURCE=.\IIOP_Profile.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\IIOP_Transport.i

 # End Source File

 # Begin Source File

 

@@ -4100,15 +4164,15 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_Parser.i

+SOURCE=.\IOPS_T.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Leader_Follower.i

+SOURCE=.\IOR_Parser.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.i

+SOURCE=.\Leader_Follower.i

 # End Source File

 # Begin Source File

 

@@ -4136,6 +4200,10 @@ SOURCE=.\MessagingS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\MProfile.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\NVList.i

 # End Source File

 # Begin Source File

@@ -4160,6 +4228,10 @@ SOURCE=.\OctetSeqC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\operation_details.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\ORB.i

 # End Source File

 # Begin Source File

@@ -4188,7 +4260,15 @@ SOURCE=.\Parser_Registry.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.i

+SOURCE=.\Pluggable.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pluggable_Messaging.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pluggable_Messaging_Utils.i

 # End Source File

 # Begin Source File

 

@@ -4204,6 +4284,14 @@ SOURCE=.\PollableC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.i

 # End Source File

 # Begin Source File

@@ -4216,7 +4304,7 @@ SOURCE=.\PortableInterceptorC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableServerC.i

+SOURCE=.\Principal.i

 # End Source File

 # Begin Source File

 

@@ -4232,10 +4320,6 @@ SOURCE=.\Profile.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Reactor_Per_Priority.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor_Registry.i

 # End Source File

 # Begin Source File

@@ -4288,22 +4372,6 @@ SOURCE=.\Services.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\SHMIOP_Acceptor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\SHMIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\SHMIOP_Endpoint.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\SHMIOP_Profile.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Single_Reactor.i

 # End Source File

 # Begin Source File

@@ -4320,6 +4388,10 @@ SOURCE=.\stub.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Sync_Strategies.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Tagged_Components.i

 # End Source File

 # Begin Source File

@@ -4352,31 +4424,27 @@ SOURCE=.\TAOS.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\target_specification.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.i

+SOURCE=.\TAOS_T.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\typecode.i

+SOURCE=.\target_specification.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Connect.i

+SOURCE=.\TimeBaseC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Endpoint.i

+SOURCE=.\TimeBaseS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\uiop_endpoints.i

+SOURCE=.\TimeBaseS_T.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\UIOP_Profile.i

+SOURCE=.\typecode.i

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 173e5c0a849..69211eb55ef 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -99,10 +99,6 @@ SOURCE=.\Acceptor_Registry.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Adapter.h

 # End Source File

 # Begin Source File

@@ -231,15 +227,15 @@ SOURCE=.\DomainC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS.h

+SOURCE=.\Dynamic_Adapter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Dynamic_Adapter.h

+SOURCE=.\DynamicC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DynamicC.h

+SOURCE=.\Encodable.h

 # End Source File

 # Begin Source File

 

@@ -267,11 +263,23 @@ SOURCE=.\FILE_Parser.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Forwarding_Servant.h

+SOURCE=.\giop.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\giop.h

+SOURCE=.\GIOP_Message_Accept_State.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Acceptors.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Base.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Connectors.h

 # End Source File

 # Begin Source File

 

@@ -279,10 +287,18 @@ SOURCE=.\GIOP_Message_Headers.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Message_Lite.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_State.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Utils.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOPC.h

 # End Source File

 # Begin Source File

@@ -315,6 +331,10 @@ SOURCE=.\IIOP_Factory.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IIOP_Lite_Factory.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IIOP_Profile.h

 # End Source File

 # Begin Source File

@@ -347,10 +367,18 @@ SOURCE=.\IOPS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOPS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ior_corbaloc_export.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\ior_corbaname_export.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IOR_Parser.h

 # End Source File

 # Begin Source File

@@ -407,10 +435,6 @@ SOURCE=.\object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.h

 # End Source File

 # Begin Source File

@@ -435,7 +459,7 @@ SOURCE=.\OctetSeqC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Operation_Table.h

+SOURCE=.\operation_details.h

 # End Source File

 # Begin Source File

 

@@ -479,19 +503,11 @@ SOURCE=.\Pluggable.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\poa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA_CORBA.h

+SOURCE=.\Pluggable_Messaging.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\poa_macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.h

+SOURCE=.\Pluggable_Messaging_Utils.h

 # End Source File

 # Begin Source File

 

@@ -515,6 +531,10 @@ SOURCE=.\PollableS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.h

 # End Source File

 # Begin Source File

@@ -611,14 +631,6 @@ SOURCE=.\Sequence_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\servant_base.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_Strategy_Factory.h

 # End Source File

 # Begin Source File

@@ -655,19 +667,19 @@ SOURCE=.\stub.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Synch_Reply_Dispatcher.h

+SOURCE=.\Sync_Strategies.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.h

+SOURCE=.\Synch_Reply_Dispatcher.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Profile.h

+SOURCE=.\Tagged_Components.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO.h

+SOURCE=.\Tagged_Profile.h

 # End Source File

 # Begin Source File

 

@@ -703,6 +715,18 @@ SOURCE=.\target_specification.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\TimeBaseC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseS_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timeprobe.h

 # End Source File

 # Begin Source File

@@ -711,6 +735,10 @@ SOURCE=.\Transport_Mux_Strategy.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\try_macros.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\typecode.h

 # End Source File

 # Begin Source File

@@ -763,10 +791,6 @@ SOURCE=.\Acceptor_Registry.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Adapter.i

 # End Source File

 # Begin Source File

@@ -819,15 +843,15 @@ SOURCE=.\Connection_Handler.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.i

+SOURCE=.\CONV_FRAMEC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

+SOURCE=.\CONV_FRAMES.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMES.i

+SOURCE=.\CONV_FRAMES_T.i

 # End Source File

 # Begin Source File

 

@@ -847,6 +871,10 @@ SOURCE=.\CORBANAME_Parser.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\CurrentC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\default_client.i

 # End Source File

 # Begin Source File

@@ -871,10 +899,6 @@ SOURCE=.\DomainC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynamicC.i

 # End Source File

 # Begin Source File

@@ -903,18 +927,54 @@ SOURCE=.\giop.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Message_Accept_State.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Acceptors.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Base.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOP_Message_Connectors.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_Headers.i

 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Message_Lite.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_State.i

 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOP_Utils.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOPC.i

 # End Source File

 # Begin Source File

 

+SOURCE=.\GIOPS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\GIOPS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\IIOP_Acceptor.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IIOP_Connect.i

 # End Source File

 # Begin Source File

@@ -927,7 +987,11 @@ SOURCE=.\iiop_endpoints.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_ORB.i

+SOURCE=.\IIOP_Profile.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\IIOP_Transport.i

 # End Source File

 # Begin Source File

 

@@ -955,6 +1019,10 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOPS_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IOR_Parser.i

 # End Source File

 # Begin Source File

@@ -987,6 +1055,10 @@ SOURCE=.\MessagingS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\MProfile.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\NVList.i

 # End Source File

 # Begin Source File

@@ -1011,6 +1083,10 @@ SOURCE=.\OctetSeqC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\operation_details.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\ORB.i

 # End Source File

 # Begin Source File

@@ -1039,7 +1115,15 @@ SOURCE=.\Parser_Registry.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.i

+SOURCE=.\Pluggable.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pluggable_Messaging.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pluggable_Messaging_Utils.i

 # End Source File

 # Begin Source File

 

@@ -1051,6 +1135,18 @@ SOURCE=.\PolicyC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.i

 # End Source File

 # Begin Source File

@@ -1063,6 +1159,10 @@ SOURCE=.\PortableInterceptorC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Principal.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Priority_Mapping.i

 # End Source File

 # Begin Source File

@@ -1119,10 +1219,6 @@ SOURCE=.\Sequence_T.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Server_Request.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Service_Callbacks.i

 # End Source File

 # Begin Source File

@@ -1147,6 +1243,10 @@ SOURCE=.\stub.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Sync_Strategies.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Tagged_Components.i

 # End Source File

 # Begin Source File

@@ -1179,11 +1279,23 @@ SOURCE=.\TAOS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\TAOS_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\target_specification.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Timeprobe.i

+SOURCE=.\TimeBaseC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\TimeBaseS_T.i

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
deleted file mode 100644
index 0f2b325646e..00000000000
--- a/TAO/tao/poa_macros.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#ifndef TAO_POA_MACROS_H
-#define TAO_POA_MACROS_H
-#include "ace/pre.h"
-
-#include "tao/try_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_OBJECT_ADAPTER_GUARD \
-  ACE_GUARD_THROW_EX (ACE_Lock, \
-                      monitor, \
-                      this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK
-
-#define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \
-  ACE_GUARD_THROW_EX (ACE_Lock, \
-                      monitor, \
-                      this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
-
-#define TAO_POA_GUARD \
-  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK
-
-#define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK_RETURN (RETURN)
-
-#include "ace/post.h"
-#endif /* TAO_POA_MACROS_H */