Selectively merged changes in the main trunk into the branch for 1.30.2 release.

[SVN r19569]

include/boost/config/stdlib/dinkumware.hpp

@@ -18,12 +18,13 @@
 #if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306)
    // full dinkumware 3.06 and above
    // fully conforming provided the compiler supports it:
-#  if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD)   // can be defined in yvals.h
+#  if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700))   // can be defined in yvals.h
 #     define BOOST_NO_STDC_NAMESPACE
 #  endif
 #  if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC)
 #     define BOOST_NO_STD_ALLOCATOR
 #  endif
+#  define BOOST_HAS_PARTIAL_STD_ALLOCATOR
 #  if defined(_MSC_VER) && (_MSC_VER < 1300)
       // if this lib version is set up for vc6 then there is no std::use_facet:
 #     define BOOST_NO_STD_USE_FACET
@@ -56,6 +57,7 @@
 #  endif
 #endif
 
+
 #if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306)
    // if we're using a dinkum lib that's
    // been configured for VC6/7 then there is

include/boost/config/stdlib/libcomo.hpp

@@ -5,7 +5,7 @@
 
 //  See http://www.boost.org for most recent version.
 
-//  Commeau STL:
+//  Comeau STL:
 
 #if !defined(__LIBCOMO__)
 #  include <utility>
@@ -15,8 +15,9 @@
 #endif
 
 //
-// std::streambuf<wchar_t> is non-standard:
-//
+// std::streambuf<wchar_t> is non-standard
+// NOTE: versions of libcomo prior to beta28 have octal version numbering,
+// e.g. version 25 is 21 (dec)
 #if __LIBCOMO_VERSION__ <= 22
 #  define BOOST_NO_STD_WSTREAMBUF
 #endif
@@ -29,5 +30,5 @@
 //
 #define BOOST_HAS_SGI_TYPE_TRAITS
 
-#define BOOST_STDLIB "Commeau standard library" BOOST_STRINGIZE(__LIBCOMO_VERSION__)
+#define BOOST_STDLIB "Comeau standard library " BOOST_STRINGIZE(__LIBCOMO_VERSION__)
 

include/boost/config/stdlib/stlport.hpp

@@ -49,11 +49,14 @@
 // If the streams are not native, and we have a "using ::x" compiler bug
 // then the io stream facets are not available in namespace std::
 //
-#if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
-#  define BOOST_NO_STD_LOCALE
-#endif
-#if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
-#  define BOOST_NO_STD_LOCALE
+#ifdef _STLPORT_VERSION
+#  if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
+#     define BOOST_NO_STD_LOCALE
+#  endif
+#else
+#  if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
+#     define BOOST_NO_STD_LOCALE
+#  endif
 #endif
 
 //