[Boost-commit] svn:boost r52935 - branches/release/boost/detail

Subject: [Boost-commit] svn:boost r52935 - branches/release/boost/detail
From: bdawes_at_[hidden]
Date: 2009-05-12 07:27:20

Author: bemandawes
Date: 2009-05-12 07:27:19 EDT (Tue, 12 May 2009)
New Revision: 52935
URL: http://svn.boost.org/trac/boost/changeset/52935

Log:
Merge from trunk
Added:
   branches/release/boost/detail/scoped_enum_emulation.hpp
      - copied unchanged from r52934, /trunk/boost/detail/scoped_enum_emulation.hpp
Text files modified: 
   branches/release/boost/detail/is_incrementable.hpp   |    12 +++++++++++-                            
   branches/release/boost/detail/utf8_codecvt_facet.hpp |    21 +++++++--------------                   
   2 files changed, 18 insertions(+), 15 deletions(-)

Modified: branches/release/boost/detail/is_incrementable.hpp
==============================================================================
--- branches/release/boost/detail/is_incrementable.hpp	(original)
+++ branches/release/boost/detail/is_incrementable.hpp	2009-05-12 07:27:19 EDT (Tue, 12 May 2009)
@@ -63,7 +63,12 @@
   tag operator,(tag,int);  
 #  define BOOST_comma(a,b) (a,b)
 # endif 
-  
+
+# if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4913) // Warning about operator,
+# endif 
+
   // two check overloads help us identify which operator++ was picked
   char (& check(tag) )[2];
   
@@ -92,6 +97,11 @@
         , value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1
       );
   };
+
+# if defined(BOOST_MSVC)
+#  pragma warning(pop)
+# endif 
+
 }
 
 # undef BOOST_comma

Modified: branches/release/boost/detail/utf8_codecvt_facet.hpp
==============================================================================
--- branches/release/boost/detail/utf8_codecvt_facet.hpp	(original)
+++ branches/release/boost/detail/utf8_codecvt_facet.hpp	2009-05-12 07:27:19 EDT (Tue, 12 May 2009)
@@ -79,25 +79,18 @@
 // specialized on those types for this to work.
 
 #include <locale>
-// for mbstate_t
-#include <wchar.h>
-// for std::size_t
-#include <cstddef>
+#include <cwchar>   // for mbstate_t
+#include <cstddef>  // for std::size_t
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
+#if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std {
-    #if defined(__LIBCOMO__)
-        using ::mbstate_t;
-    #elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(__BORLANDC__)
-        using ::mbstate_t;
-    #elif defined(__SGI_STL_PORT)
-    #elif defined(BOOST_NO_STDC_NAMESPACE)
-        using ::mbstate_t;
-        using ::codecvt;
-    #endif
-} // namespace std
+    using ::mbstate_t;
+    using ::size_t;
+}
+#endif
 
 #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)
     #define BOOST_CODECVT_DO_LENGTH_CONST const