diff options
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/tao/ValueBase.h | 12 | ||||
| -rw-r--r-- | TAO/tao/corbafwd.h | 2 |
3 files changed, 25 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aad4a439bc4..9dbadc95e9c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Tue Mar 11 10:46:29 2003 Ossama Othman <ossama@uci.edu> + + * tao/corbafwd.h: + + Removed CORBA::{add,remove}_ref() static function declarations. + They conflicted with the ones defined in `ValueBase.h'. + + * tao/ValueBase.h: + + Corrected CORBA::{add,remove}_ref() static function declarations + so that "inconsistent DLL linkage" warnings no longer occur in + MS Windows TAO builds. + + Include "ace/Basic_Types.h" instead of "ace/OS.h". The former + is all that is needed for the "ptr_arith_t" typedef. Inclusion + of "ace/OS.h" is overkill. + Mon Mar 10 20:24:17 2003 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: Make the SSLIOP diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h index a933c1da20d..09f993b90b6 100644 --- a/TAO/tao/ValueBase.h +++ b/TAO/tao/ValueBase.h @@ -22,14 +22,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" /* for ptr_arith_t */ -#include "ace/Synch_T.h" #include "tao/corbafwd.h" +#include "ace/Basic_Types.h" /* for ptr_arith_t */ +#include "ace/Synch_T.h" + + namespace CORBA { - TAO_NAMESPACE_INLINE_FUNCTION void add_ref (CORBA::ValueBase *val); - TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (CORBA::ValueBase *val); + class ValueBase; + + TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *); + TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *); /** * @class ValueBase diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index b0a87907632..ef94dbedc5c 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -287,8 +287,6 @@ namespace CORBA typedef ValueFactoryBase *ValueFactory; typedef ValueFactoryBase_var ValueFactory_var; class DefaultValueRefCountBase; - TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *); - TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *); class AbstractBase; typedef AbstractBase * AbstractBase_ptr; |