diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-10 16:10:43 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-10 16:10:43 +0000 |
commit | 532c772deb4280684ec4d8bcd1a67433bb07ecf8 (patch) | |
tree | 84a25899b7562fa4556bbd723045ea63007095e2 /TAO/tao/orbconf.h | |
parent | 312d2aa01042417d9d6484aab3f2c73d47715e5e (diff) | |
download | ATCD-532c772deb4280684ec4d8bcd1a67433bb07ecf8.tar.gz |
ChangeLogTag:Mon Mar 10 08:10:02 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r-- | TAO/tao/orbconf.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 5f52cf1f417..5ecdbd87771 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -21,6 +21,7 @@ // "ace/OS.h" is overkill. "ace/Basic_Types.h" is enough. In // particular, it is needed for the definition of ACE_LITTLE_ENDIAN. #include "ace/Basic_Types.h" +#include "ace/Global_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -266,15 +267,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; #undef major #endif /* major*/ -#if !defined (ACE_NESTED_CLASS) -#if defined (ACE_HAS_BROKEN_NAMESPACES) -#define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS -#else /* !ACE_HAS_BROKEN_NAMSPACES*/ -#define ACE_NESTED_CLASS(SCOPE,CLASS) SCOPE::CLASS -#endif /* ACE_HAS_BROKEN_NAMSPACES*/ -#endif /*ACE_NESTED_CLASS */ - - #if !defined (TAO_EXPORT_NESTED_CLASSES) \ && defined (ACE_EXPORT_NESTED_CLASSES) #define TAO_EXPORT_NESTED_CLASSES |