diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Utils/Servant_Var.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Utils/Servant_Var.inl | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 62413c4b783..35828ea2731 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Apr 11 13:13:27 UTC 2006 Simon McQueen <sm@prismtech.com> + + * tao/Utils/Servant_Var.h: + * tao/Utils/Servant_Var.inl: + + Add ACE_LACKS_MEMBER_TEMPLATES guards around problematic equality + operators. + Mon Apr 10 18:42:47 UTC 2006 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc: diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h index 626b5e285b7..9fc8f6cb920 100644 --- a/TAO/tao/Utils/Servant_Var.h +++ b/TAO/tao/Utils/Servant_Var.h @@ -140,6 +140,7 @@ 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, @@ -149,6 +150,7 @@ 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 diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index da2ff1d6e95..be906d9982f 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -205,6 +205,7 @@ TAO::Utils::Servant_Var<T>::_retn (void) return rval; } +#ifndef ACE_LACKS_MEMBER_TEMPLATES template <class X, class Y> ACE_INLINE bool operator== (typename TAO::Utils::Servant_Var<X> const & x, @@ -220,5 +221,6 @@ operator!= (typename TAO::Utils::Servant_Var<X> const & x, { return x.in () != y.in (); } +#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */ TAO_END_VERSIONED_NAMESPACE_DECL |