summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/TypeCode.h5
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 010b603d2d6..d5c1d751974 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 14 14:33:22 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * tao/TypeCode.h (unaliased_kind):
+
+ Declare this function with the ACE_NAMESPACE_INLINE_FUNCTION
+ macro to address link-time errors on Windows.
+
Thu Apr 14 10:42:08 2005 J.T. Conklin <jtc@acorntoolworks.com>
* tao/Makefile.am:
diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h
index 14067f9748d..741b6dab11c 100644
--- a/TAO/tao/TypeCode.h
+++ b/TAO/tao/TypeCode.h
@@ -506,8 +506,9 @@ namespace TAO
* on the unaliased @c TypeCode returned from
* @c unaliased_typecode().
*/
- TAO_Export CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
- ACE_ENV_ARG_DECL);
+ ACE_NAMESPACE_INLINE_FUNCTION
+ CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
+ ACE_ENV_ARG_DECL);
}