diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/TypeCode.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a075af152dd..232d4d06d9e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Apr 14 16:12:33 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/TypeCode.h (unaliased_kind): + + Declare with TAO_NAMESPACE_INLINE_FUNCTION, not + ACE_NAMESPACE_INLINE_FUNCTION. Fixes "inconsistent dll linkage" + warnings. + Thu Apr 14 15:03:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/TypeCode.cpp (operator>>): diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h index 741b6dab11c..b411663eb84 100644 --- a/TAO/tao/TypeCode.h +++ b/TAO/tao/TypeCode.h @@ -506,7 +506,7 @@ namespace TAO * on the unaliased @c TypeCode returned from * @c unaliased_typecode(). */ - ACE_NAMESPACE_INLINE_FUNCTION + TAO_NAMESPACE_INLINE_FUNCTION CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL); |