diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-01-11 23:38:57 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-01-11 23:38:57 +0000 |
| commit | f4125ced6f2c5c4f3adc957ce54bcbf223485029 (patch) | |
| tree | 5325863be23d12d12028c39592046f938dd74168 | |
| parent | 097a7e3ba713e437e163637cacd008bcea67b0d0 (diff) | |
| download | ATCD-f4125ced6f2c5c4f3adc957ce54bcbf223485029.tar.gz | |
ChangeLogTag: Fri Jan 11 17:36:22 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 18 |
2 files changed, 12 insertions, 14 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 18c28ee2397..8ff39efc45a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Fri Jan 11 17:36:22 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/orbconf.h: Removed the #if defined clause for the + TAO_NAMESPACE definition. Now TAO_NAMESPACE will define + namespace by default with no conditionality associated. The + macro has been left behind for backward compatibility. This + shoudl fix the LynxOS builds. + Fri Jan 11 12:28:48 2002 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/tests/Security/Makefile (DIRS): diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index e01d24a5586..d7565ba07e7 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -188,11 +188,9 @@ const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16; # define TAO_CONNECTION_CACHE_MAXIMUM (ACE::max_handles () / 2) #endif /* TAO_CONNECTION_CACHE_MAXIMUM */ -// This deals with platforms that support namespaces vs platforms that -// don't. @@ MSVC's namespace implementation is somehow broken. -// The following macros are required to deal with the most bizarre and insane -// behavior of the MSVC++ compiler -#if defined (ACE_HAS_USING_KEYWORD) + +// This definition theoretically is not required. Just leaving it here +// for backward compatibility #define TAO_NAMESPACE namespace #define TAO_NAMESPACE_CLOSE #define TAO_NAMESPACE_STORAGE_CLASS extern TAO_EXPORT_MACRO @@ -200,15 +198,7 @@ const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16; #define TAO_NAMESPACE_END } #define TAO_NAMESPACE_TYPE(TYPE) #define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) TYPE NAME = RHS; -#else -#define TAO_NAMESPACE struct TAO_EXPORT_MACRO -#define TAO_NAMESPACE_CLOSE ; -#define TAO_NAMESPACE_STORAGE_CLASS static -#define TAO_NAMESPACE_BEGIN(NS) NS##:: -#define TAO_NAMESPACE_END -#define TAO_NAMESPACE_TYPE(TYPE) TYPE -#define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) NAME = RHS; -#endif /* ACE_HAS_USING_KEYWORD */ + # if defined (_MSC_VER) && defined (__ACE_INLINE__) # define TAO_NAMESPACE_INLINE_FUNCTION inline |