diff options
Diffstat (limited to 'TAO/tao/PortableServer/Servant_Base.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index a91077fe966..170196e7695 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Operation_Table.h" -#include "tao/PortableServer/POA_Current_Impl.h" +#include "Servant_Base.h" +#include "Root_POA.h" +#include "Operation_Table.h" +#include "POA_Current_Impl.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" @@ -23,7 +23,7 @@ ACE_RCSID (PortableServer, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Servant_Base.i" +# include "Servant_Base.i" #endif /* ! __ACE_INLINE__ */ #if defined (ACE_ENABLE_TIMEPROBES) @@ -46,8 +46,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ServantBase::TAO_ServantBase (void) : TAO_Abstract_ServantBase () , ref_count_ (1) @@ -479,4 +477,3 @@ TAO_ServantBase_var::_retn (void) return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL |