ChangeLogTag: Fri Dec 17 22:25:56 1999 David L. Levine <levine@cs.wustl.edu>

4 files changed, 77 insertions, 49 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 2784b19d031..f8bdc6f8938 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,13 +1,21 @@
+Fri Dec 17 22:25:56 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/config-cxx-common.h: added, to factor out common
+          configuration for Compaq cxx.
+
+        * ace/config-osf1-4.0.h,config-linux-common.h: updated to
+          use config-cxx-common.h.
+
 Fri Dec 17 21:32:48 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/config-linux-common.h: added support for Compaq
-          (Digital Unix) cxx.  Currently, that just means allowing
+          (Digital) cxx.  Currently, that just means allowing
           compilation to succeed.
 
 Fri Dec 17 21:29:19 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/OS.h: use __DECCXX instead of DEC_CXX to detect that
-          the compiler is Compaq (Digital Unix) cxx.  DEC_CXX is
+          the compiler is Compaq (Digital) cxx.  DEC_CXX is
           #defined in ACE config files for cxx, but __DECCXX is
           #defined by the compiler.  Only the latter should be used.
 
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
new file mode 100644
index 00000000000..1b70381c1f8
--- /dev/null
+++ b/ace/config-cxx-common.h
@@ -0,0 +1,62 @@
+// $Id$
+
+#ifndef ACE_CXX_COMMON_H
+#define ACE_CXX_COMMON_H
+
+#if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON)
+# error ace/config-cxx-common.h: ACE configuration error!  Do not #include this file directly!
+#endif
+
+#if defined (__DECCXX)
+# define ACE_HAS_STRING_CLASS
+# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF
+# define ACE_LACKS_SIGNED_CHAR
+# define DEC_CXX
+# if (__DECCXX_VER >= 60090010)
+    // DEC CXX 6.0 supports exceptions, etc., by default.  Exceptions
+    // are enabled by platform_osf1_4.0.GNU/wrapper_macros.GNU.
+#   if defined (ACE_HAS_EXCEPTIONS)  &&  !defined (linux)
+#     define ACE_NEW_THROWS_EXCEPTIONS
+#   endif /* ACE_HAS_EXCEPTIONS */
+#   define ACE_HAS_ANSI_CASTS
+#   if !defined (__RTTI)
+#     define ACE_LACKS_RTTI
+#   endif
+#   define ACE_HAS_STDCPP_STL_INCLUDES
+#   define ACE_HAS_TEMPLATE_SPECIALIZATION
+#   define ACE_HAS_TEMPLATE_TYPEDEFS
+#   define ACE_HAS_TYPENAME_KEYWORD
+#   define ACE_HAS_USING_KEYWORD
+
+//    9: nested comment not allowed.  (/usr/include/pdsc.h!) (nestcomment)
+//  177: variable was declared but never referenced (declbutnotref)
+//  193: zero used for undefined preprocessing identifier (undpreid)
+//  236: controlling expression is constant (boolexprconst)
+//  401: base_class_with_nonvirtual_dtor (basclsnondto)
+// 1016: expected type is incompatible with declared type of int (incint)
+// 1136: conversion to smaller size integer could lose data (intconlosbit)
+
+#   pragma message disable basclsnondto
+#   pragma message disable boolexprconst
+#   pragma message disable undpreid
+
+#   if (__DECCXX_VER >= 60190029)
+      // 6.1-029 and later support msg 1136.  Disable it because it
+      // causes warnings from ACE and/or TAO.
+#     pragma message disable intconlosbit
+#   endif /* __DECCXX_VER >= 60190029 */
+
+#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX >= 0x40F
+      // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
+#     pragma message disable declbutnotref
+#   endif /* DIGITAL_UNIX >= 4.0f */
+
+# else  /* __DECCXX_VER < 60090010 */
+#   define ACE_LACKS_PRAGMA_ONCE
+# endif /* __DECCXX_VER < 60090010 */
+#else  /* ! __DECCXX */
+# error ace/config-cxx-common.h can only be used with Compaq CXX!
+#endif /* ! __DECCXX */
+
+#endif /* ACE_CXX_COMMON_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index aab0391e531..6974dac5f6d 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -115,6 +115,8 @@
 #elif defined (__KCC)
 # include "ace/config-kcc-common.h"
 #elif defined (__DECCXX)
+# define ACE_CONFIG_INCLUDE_CXX_COMMON
+# include "ace/config-cxx-common.h"
 #else  /* ! __GNUG__ && ! __KCC && !__DECCXX */
 # error unsupported compiler in ace/config-linux-common.h
 #endif /* ! __GNUG__ && ! __KCC */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index d441dc548e2..ae9eff79bdd 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -49,53 +49,9 @@
 # define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_REENTRANT_FUNCTIONS
 #elif defined (__DECCXX)
-# define ACE_HAS_STRING_CLASS
-# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF
-# define ACE_LACKS_SIGNED_CHAR
-# define DEC_CXX
-# if (__DECCXX_VER >= 60090010)
-    // DEC CXX 6.0 supports exceptions, etc., by default.  Exceptions
-    // are enabled by platform_osf1_4.0.GNU/wrapper_macros.GNU.
-#   if defined (ACE_HAS_EXCEPTIONS)
-#     define ACE_NEW_THROWS_EXCEPTIONS
-#   endif /* ACE_HAS_EXCEPTIONS */
-#   define ACE_HAS_ANSI_CASTS
-#   if !defined (__RTTI)
-#     define ACE_LACKS_RTTI
-#   endif
-#   define ACE_HAS_STDCPP_STL_INCLUDES
-#   define ACE_HAS_TEMPLATE_SPECIALIZATION
-#   define ACE_HAS_TEMPLATE_TYPEDEFS
-#   define ACE_HAS_TYPENAME_KEYWORD
-#   define ACE_HAS_USING_KEYWORD
-
-//    9: nested comment not allowed.  (/usr/include/pdsc.h!) (nestcomment)
-//  177: variable was declared but never referenced (declbutnotref)
-//  193: zero used for undefined preprocessing identifier (undpreid)
-//  236: controlling expression is constant (boolexprconst)
-//  401: base_class_with_nonvirtual_dtor (basclsnondto)
-// 1016: expected type is incompatible with declared type of int (incint)
-// 1136: conversion to smaller size integer could lose data (intconlosbit)
-
-#   pragma message disable basclsnondto
-#   pragma message disable boolexprconst
-#   pragma message disable undpreid
-
-#   if (__DECCXX_VER >= 60190029)
-      // 6.1-029 and later support msg 1136.  Disable it because it
-      // causes warnings from ACE and/or TAO.
-#     pragma message disable intconlosbit
-#   endif /* __DECCXX_VER >= 60190029 */
-
-#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX >= 0x40F
-      // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-#     pragma message disable declbutnotref
-#   endif /* DIGITAL_UNIX >= 4.0f */
-
-# else  /* __DECCXX_VER < 60090010 */
-#   define ACE_LACKS_PRAGMA_ONCE
-# endif /* __DECCXX_VER < 60090010 */
+
+# define ACE_CONFIG_INCLUDE_CXX_COMMON
+# include "ace/config-cxx-common.h"
 
 #elif defined (__rational__)
 # define ACE_HAS_REENTRANT_FUNCTIONS