ChangeLogTag:Fri Feb 21 12:52:00 2003 Ossama Othman <ossama@uci.edu>

3 files changed, 28 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index b2248be4e8a..6414d5023ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 21 12:52:00 2003  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Global_Macros.h:
+	* ace/OS.h:
+
+	  Moved ACE_CORBA_{1,2,3} and ACE_NESTED_CLASS macro out of OS.h
+	  and into Global_Macros.h.  Helps avoid inclusion of OS.h in some
+	  cases.
+
 Fri Feb 21 10:05:23 2003  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Local_Name_Space_T.cpp:
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index 75408223092..15a1b697295 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -103,6 +103,25 @@ friend class ace_dewarn_gplusplus
 
 // ----------------------------------------------------------------
 
+// Deal with MSVC++ 6 (or less) insanity for CORBA...
+# if defined (ACE_HAS_BROKEN_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
+#   if !defined (ACE_NESTED_CLASS)
+#     define ACE_NESTED_CLASS(TYPE, NAME) NAME
+#   endif  /* !ACE_NESTED_CLASS */
+# else  /* ! ACE_HAS_BROKEN_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
+#   if !defined (ACE_NESTED_CLASS)
+#     define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
+#   endif  /* !ACE_NESTED_CLASS */
+# endif /* ! ACE_HAS_BROKEN_NAMESPACES */
+
+// ----------------------------------------------------------------
+
 # define ACE_TRACE_IMPL(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__))
 
 # if (ACE_NTRACE == 1)
diff --git a/ace/OS.h b/ace/OS.h
index 8670316cdba..8f886a9ca8d 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -59,19 +59,6 @@ typedef long long longlong_t;
 typedef long      id_t;
 # endif /* ACE_PSOS_TM */
 
-// Deal with MSVC++ insanity for CORBA...
-# if defined (ACE_HAS_BROKEN_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  /* ! ACE_HAS_BROKEN_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
-# endif /* ! ACE_HAS_BROKEN_NAMESPACES */
-
 // Here are all ACE-specific default constants, needed throughout ACE
 // and its applications.  The values can be over written by user
 // specific values in config.h files.