diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-09 18:01:35 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-09 18:01:35 +0000 |
| commit | f32c44c828f482da03e5b5ea4a9ea0421e00e1eb (patch) | |
| tree | f9ddadddbdab3d4b64de3d73c3e1d4f42f450481 | |
| parent | f2e4f3adc69c1e63eeec1b1401cee11c07c584a1 (diff) | |
| download | ATCD-f32c44c828f482da03e5b5ea4a9ea0421e00e1eb.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98a | 8 | ||||
| -rw-r--r-- | ace/Map_Manager.cpp | 4 | ||||
| -rw-r--r-- | ace/OS.h | 12 | ||||
| -rw-r--r-- | ace/config-win32.h | 8 |
4 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 5e5c9f346aa..7766a7a82bc 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,3 +1,11 @@ +Fri Jan 09 11:56:44 1998 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/config-win32.h (ACE_ORBIX_HAS_NAMESPACES): By default, you + will get the proper namespace usage for Orbix. If you don't + like this, comment out the #define ACE_ORBIX_HAS_NAMESPACES line + or #undef ACE_ORBIX_HAS_NAMESPACES in your config.h file after + including this config-win32.h. + Fri Jan 9 11:35:53 1998 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> * ACE-categories: Added all the ACE files into the ACE-categories diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp index 4c05c68870e..9e132a53f22 100644 --- a/ace/Map_Manager.cpp +++ b/ace/Map_Manager.cpp @@ -15,7 +15,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Map_Entry) - template <class EXT_ID, class INT_ID> +template <class EXT_ID, class INT_ID> ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void) { // No-op just to keep some compilers happy... @@ -33,7 +33,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const ACE_ALLOC_HOOK_DEFINE(ACE_Map_Manager) - template <class EXT_ID, class INT_ID, class ACE_LOCK> void +template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump"); @@ -35,16 +35,16 @@ #endif /* ACE_HAS_ANSI_CASTS */ // Deal with MSVC++ insanity for CORBA... -#if defined (ACE_WIN32) && !defined (ACE_ORBIX_HAS_NAMESPACES) -#define ACE_CORBA_1(NAME) CORBA_##NAME -#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME -#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME -#define ACE_NESTED_CLASS(TYPE, NAME) NAME -#else +#if defined (ACE_WIN32) && defined (ACE_ORBIX_HAS_NAMESPACES) #define ACE_CORBA_1(NAME) CORBA::##NAME #define ACE_CORBA_2(TYPE, NAME) CORBA::##TYPE##::##NAME #define ACE_CORBA_3(TYPE, NAME) CORBA::##TYPE##::##NAME #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::##NAME +#else +#define ACE_CORBA_1(NAME) CORBA_##NAME +#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME +#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME +#define ACE_NESTED_CLASS(TYPE, NAME) NAME #endif /* ACE_WIN32 */ // Define some helpful macros. diff --git a/ace/config-win32.h b/ace/config-win32.h index e8a029cb333..5955e3320b6 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -116,6 +116,14 @@ #define ACE_HAS_MT_ORBIX 0 #endif +// By default, you will get the proper namespace usage for Orbix. If +// you don't like this, comment out the #define line or #undef +// ACE_ORBIX_HAS_NAMESPACES in your config.h file after including this +// file. +#if !defined (ACE_ORBIX_HAS_NAMESPACES) +#define ACE_ORBIX_HAS_NAMESPACES +#endif /* ACE_ORBIX_HAS_NAMESPACES */ + // By default, we disable the C++ casting because // it requires the RTTI support to be turned on which // is not something we usually do. |