Cleanup ACE_HAS_STDCPP_STL_INCLUDES

    * ACE/ace/IOStream.h:
    * ACE/ace/README:
    * ACE/ace/config-g++-common.h:
    * ACE/ace/config-icc-common.h:
    * ACE/ace/config-linux-common.h:
    * ACE/ace/config-openvms.h:
    * ACE/ace/config-suncc-common.h:
    * ACE/ace/config-sunos5.6.h:
    * ACE/ace/config-win32-interix.h:

9 files changed, 4 insertions, 24 deletions

diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h
index cd22e65e98c..27465c6c02d 100644
--- a/ACE/ace/IOStream.h
+++ b/ACE/ace/IOStream.h
@@ -42,24 +42,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef CString ACE_IOStream_String;
 ACE_END_VERSIONED_NAMESPACE_DECL
 #    else
-#      if !defined (ACE_HAS_STDCPP_STL_INCLUDES)
-#include /**/ <String.h>
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-typedef String ACE_IOStream_String;
-ACE_END_VERSIONED_NAMESPACE_DECL
-#      else
-#        include /**/ <string>
+#      include /**/ <string>
 
-#        if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#      if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef std::string ACE_IOStream_String;
 ACE_END_VERSIONED_NAMESPACE_DECL
-#        else
+#      else
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef string ACE_IOStream_String;
 ACE_END_VERSIONED_NAMESPACE_DECL
-#        endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-#      endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */
+#      endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 #    endif /* ACE_WIN32 && defined (_MSC_VER) */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/README b/ACE/ace/README
index e975426f438..17db6776050 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -553,9 +553,6 @@ ACE_HAS_STHREADS                        Platform supports Solaris
                                         threads
 ACE_HAS_STANDARD_CPP_LIBRARY            Platform/compiler supports
                                         Standard C++ Library
-ACE_HAS_STDCPP_STL_INCLUDES             Standard C++ headers can be
-                                        included in the standard way.
-                                        e.g. #include <vector>
 ACE_HAS_STRBUF_T                        Compiler/platform supports
                                         struct strbuf
 ACE_HAS_STRDUP_EMULATION                Use ACE's strdup() emulation (even
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 50daf671852..9592e9340c7 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -15,7 +15,6 @@
 #define ACE_CC_BETA_VERSION (0)
 
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_STDCPP_STL_INCLUDES
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index 4fab19823d6..1c6ef3a3653 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -4,7 +4,6 @@
 #include /**/ "ace/pre.h"
 
 # define ACE_HAS_CPLUSPLUS_HEADERS
-# define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 23e0f579594..a09e5df09c9 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -61,7 +61,6 @@
 #elif defined (__PGI)
 // Portable group compiler
 #  define ACE_HAS_CPLUSPLUS_HEADERS
-#  define ACE_HAS_STDCPP_STL_INCLUDES
 #  define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #  define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #  define ACE_LACKS_SWAB
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 28d8c01c6f1..f6f8491b5e4 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -50,8 +50,6 @@
 
 #define ACE_MAX_UDP_PACKET_SIZE 65535
 
-#define ACE_HAS_STDCPP_STL_INCLUDES 1
-
 /* missing system headers */
 #define ACE_LACKS_STDINT_H  1
 #define ACE_LACKS_SYS_IPC_H 1
diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h
index ff4d38c4236..1f45779cedb 100644
--- a/ACE/ace/config-suncc-common.h
+++ b/ACE/ace/config-suncc-common.h
@@ -4,7 +4,6 @@
 #include /**/ "ace/pre.h"
 
 # define ACE_HAS_CPLUSPLUS_HEADERS
-# define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h
index a6e2f0c36a4..115ace0368b 100644
--- a/ACE/ace/config-sunos5.6.h
+++ b/ACE/ace/config-sunos5.6.h
@@ -49,9 +49,6 @@
 #ifndef ACE_HAS_SIG_C_FUNC
 #define ACE_HAS_SIG_C_FUNC                      1
 #endif /* ACE_HAS_SIG_C_FUNC */
-#ifndef ACE_HAS_STDCPP_STL_INCLUDES
-#define ACE_HAS_STDCPP_STL_INCLUDES             1
-#endif /* ACE_HAS_STDCPP_STL_INCLUDES */
 #ifndef ACE_HAS_STRING_CLASS
 #define ACE_HAS_STRING_CLASS                    1
 #endif /* ACE_HAS_STRING_CLASS */
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index e3d54cb54e8..0fa6ee1febc 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -50,7 +50,6 @@
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#define ACE_HAS_STDCPP_STL_INCLUDES
 #define ACE_HAS_STREAMS
 #define ACE_HAS_STRING_CLASS
 #define ACE_HAS_STRSIGNAL