diff options
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4aaef8cd9f3..c0a29205a37 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 08 15:27:14 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/orbconf.h: The #define for ACE_NESTED_CLASS was busted. The + workaround should be applied on platforms where + ACE_HAS_BROKEN_NAMESPACES is defined instead of just + Win32. Thanks to Johnny Willemsen fo rcatching this. + Fri Mar 7 17:20:24 2003 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 667b49b9236..5f52cf1f417 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -267,12 +267,13 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; #endif /* major*/ #if !defined (ACE_NESTED_CLASS) -#if defined (ACE_WIN32) +#if defined (ACE_HAS_BROKEN_NAMESPACES) #define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS -#else /* !ACE_WIN32 */ +#else /* !ACE_HAS_BROKEN_NAMSPACES*/ #define ACE_NESTED_CLASS(SCOPE,CLASS) SCOPE::CLASS -#endif /* ACE_WIN32 */ -#endif /* ACE_NESTED_CLASS */ +#endif /* ACE_HAS_BROKEN_NAMSPACES*/ +#endif /*ACE_NESTED_CLASS */ + #if !defined (TAO_EXPORT_NESTED_CLASSES) \ && defined (ACE_EXPORT_NESTED_CLASSES) |