diff options
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Context.h | 4 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/ExceptionList.h | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 07ecdde4787..35d9ce5c188 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Apr 23 18:12:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/DynamicInterface/Context.h: + * tao/DynamicInterface/ExceptionList.h: + + Changed the declaration of CORBA::is_nil and CORBA::release + fir ContextList and ExceptionList to use + TAO_NAMESPACE_INLINE_FUNCTION instead of + TAO_DynamicInterface_Export, which was causing multiple definitions + in builds with __ACE_INLINE__ defined. + Wed Apr 23 18:06:48 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/PortableServer/POA.cpp (id_to_reference_i): diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 3683727bd59..dc3be4e7c35 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -33,8 +33,8 @@ namespace CORBA { - TAO_DynamicInterface_Export void release (ContextList_ptr); - TAO_DynamicInterface_Export Boolean is_nil (ContextList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION void release (ContextList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ContextList_ptr); typedef TAO_Pseudo_Var_T<Context> Context_var; typedef TAO_Pseudo_Out_T<Context, Context_var> Context_out; diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 9e63357fdec..6858ced253e 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -40,8 +40,8 @@ namespace CORBA { - TAO_DynamicInterface_Export void release (ExceptionList_ptr); - TAO_DynamicInterface_Export Boolean is_nil (ExceptionList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION void release (ExceptionList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ExceptionList_ptr); typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var; typedef TAO_Pseudo_Out_T<ExceptionList, ExceptionList_var> ExceptionList_out; |