[Boost-commit] svn:boost r46409 - trunk/boost/archive

From: ramey_at_[hidden]
Date: 2008-06-15 13:02:16

Author: ramey
Date: 2008-06-15 13:02:15 EDT (Sun, 15 Jun 2008)
New Revision: 46409
URL: http://svn.boost.org/trac/boost/changeset/46409

Log:
simplified namespace issue with mbstate_t
Text files modified: 
   trunk/boost/archive/codecvt_null.hpp |    22 +++++-----------------                  
   1 files changed, 5 insertions(+), 17 deletions(-)

Modified: trunk/boost/archive/codecvt_null.hpp
==============================================================================
--- trunk/boost/archive/codecvt_null.hpp	(original)
+++ trunk/boost/archive/codecvt_null.hpp	2008-06-15 13:02:15 EDT (Sun, 15 Jun 2008)
@@ -18,26 +18,14 @@
 
 #include <locale>
 #include <cstddef>
-#include <wchar.h>   // for mbstate_t
-
+#include <cwchar>   // for mbstate_t
 #include <boost/config.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 
-namespace std{
-    #if defined(__LIBCOMO__)
-        using ::mbstate_t;
-    #elif defined(__QNXNTO__)
-        //using std::mbstate_t;
-    #elif defined(BOOST_DINKUMWARE_STDLIB) && BOOST_DINKUMWARE_STDLIB == 1
-        using ::mbstate_t;
-    #elif defined(__SGI_STL_PORT)
-    #elif defined(BOOST_NO_STDC_NAMESPACE)
-        using ::codecvt;
-        using ::mbstate_t;
-    #elif defined(BOOST_RWSTD_VER)
-        using ::mbstate_t;
-   #endif
-} // namespace std
+#if defined(BOOST_NO_STDC_NAMESPACE)
+    using ::codecvt;
+    using ::mbstate_t;
+#endif
 
 namespace boost {
 namespace archive {