Don't allow newline characters in document settings.

[lyx.git] / boost / boost / detail / utf8_codecvt_facet.hpp

diff --git a/boost/boost/detail/utf8_codecvt_facet.hpp b/boost/boost/detail/utf8_codecvt_facet.hpp
index ac7e7bfded2854a61e563f1c14816e2e6bef20eb..b777ff934ebfed8964c89ee0a2dc0b42e8694ccf 100755 (executable)
--- a/boost/boost/detail/utf8_codecvt_facet.hpp
+++ b/boost/boost/detail/utf8_codecvt_facet.hpp
@@ -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