ChangeLogTag: Tue Dec 28 08:55:23 1999 David L. Levine <levine@cs.wustl.edu>

4 files changed, 36 insertions, 23 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 796c3339281..0b01fd1b902 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,10 +1,18 @@
+Tue Dec 28 08:55:23 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_linux_cxx.GNU:
+          added -D__USE_STD_IOSTREAM.
+
+        * ace/config-cxx-common.h,ace/config-linux-common.h:
+          added support for __USE_STD_IOSTREAM.
+
 Tue Dec 28 02:03:11 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/Container_T.i (remove): Changed to call the <remove> method
-	  using the <list_> in ACE_DLList[_Reverse]_Iterator, otherwise,
-	  the <remove> in the ACE_Double_Linked_List got called which
-	  incurred memory leaks.  Thanks to Lorin Hochstein
-	  <lmh@xiphos.ca> for reporting the bug.
+        * ace/Container_T.i (remove): Changed to call the <remove> method
+          using the <list_> in ACE_DLList[_Reverse]_Iterator, otherwise,
+          the <remove> in the ACE_Double_Linked_List got called which
+          incurred memory leaks.  Thanks to Lorin Hochstein
+          <lmh@xiphos.ca> for reporting the bug.
 
 Mon Dec 27 21:29:25 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index 64b4ac2c618..120c566a897 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -8,32 +8,43 @@
 #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
 # if defined (linux)
+#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #   define ACE_HAS_CPLUSPLUS_HEADERS
-# endif /* linux */
+#   if !defined (__USE_STD_IOSTREAM)
+#     define ACE_HAS_STRING_CLASS
+#   endif /* ! __USE_STD_IOSTREAM */
+# else  /* ! linux */
+#   define ACE_HAS_STRING_CLASS
+#   if (__DECCXX_VER >= 60090010)
+#     define ACE_HAS_STDCPP_STL_INCLUDES
+#   endif /* __DECCXX_VER < 60090010 */
+# endif /* ! linux */
 # 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)
+#   if defined (ACE_HAS_EXCEPTIONS)
 #     define ACE_NEW_THROWS_EXCEPTIONS
-#   endif /* ACE_HAS_EXCEPTIONS && ! linux */
+#   endif /* ACE_HAS_EXCEPTIONS */
 #   define ACE_HAS_ANSI_CASTS
 #   if !defined (__RTTI)
 #     define ACE_LACKS_RTTI
 #   endif
-#   if !defined (linux)
-#     define ACE_HAS_STDCPP_STL_INCLUDES
-#   endif /* ! linux */
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
 #   define ACE_HAS_TYPENAME_KEYWORD
 #   define ACE_HAS_USING_KEYWORD
 
+#   if defined (__USE_STD_IOSTREAM)
+#     define ACE_LACKS_CHAR_RIGHT_SHIFTS
+#     define ACE_LACKS_IOSTREAM_FX
+#     define ACE_LACKS_UNBUFFERED_STREAMBUF
+#   endif /* ! __USE_STD_IOSTREAM */
+
 //    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)
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 6974dac5f6d..27dce161b90 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -106,13 +106,13 @@
 
 // Then the compiler specific parts
 
-// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
-// this must appear before its #include.
-#define ACE_HAS_STRING_CLASS
-
 #if defined (__GNUG__)
+  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+  // this must appear before its #include.
+# define ACE_HAS_STRING_CLASS
 # include "ace/config-g++-common.h"
 #elif defined (__KCC)
+# define ACE_HAS_STRING_CLASS
 # include "ace/config-kcc-common.h"
 #elif defined (__DECCXX)
 # define ACE_CONFIG_INCLUDE_CXX_COMMON
diff --git a/include/makeinclude/platform_linux_cxx.GNU b/include/makeinclude/platform_linux_cxx.GNU
index e6b513923b1..c4a121a3b8e 100644
--- a/include/makeinclude/platform_linux_cxx.GNU
+++ b/include/makeinclude/platform_linux_cxx.GNU
@@ -17,13 +17,7 @@ CFLAGS          +=
     WARNING_FLAGS += -msg_display_number -msg_display_tag
   endif # VERBOSE_WARNING
 
-  ifneq (,$(optimize))
-    #### See ace/config-cxx-common.h for the meaning of this warning.
-    #### It's not necessary on DU 5.0.
-    WARNING_FLAGS += -msg_disable 1016
-  endif # optimize
-
-CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS)
+CCFLAGS         += $(CFLAGS) -D__USE_STD_IOSTREAM $(WARNING_FLAGS)
 ifeq ($(rtti),)
   CCFLAGS += -nortti
 endif # rtti