diff options
Diffstat (limited to 'TAO/tao/Utils/Servant_Var.h')
| -rw-r--r-- | TAO/tao/Utils/Servant_Var.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h index 9fc8f6cb920..8655ddb9a07 100644 --- a/TAO/tao/Utils/Servant_Var.h +++ b/TAO/tao/Utils/Servant_Var.h @@ -21,8 +21,6 @@ #include "ace/CORBA_macros.h" #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -140,7 +138,6 @@ namespace TAO T * ptr_; }; -#ifndef ACE_LACKS_MEMBER_TEMPLATES /// Compare two Servant_Vars for equivalence. template <class X, class Y> bool operator==(Servant_Var<X> const & x, @@ -150,19 +147,16 @@ namespace TAO template <class X, class Y> bool operator!=(Servant_Var<X> const & x, Servant_Var<Y> const & y); -#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */ } // namespace Utils } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Utils/Servant_Var.inl" +# include "Servant_Var.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Utils/Servant_Var.cpp" +#include "Servant_Var.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |