Ticket #6439: boost_po_compile_w_NO_STD_LOCALE_v2.patch

boost/program_options/detail/convert.hpp

@@ -8 +8 @@
 
 #include <boost/program_options/config.hpp>
 
-#if !defined(BOOST_NO_STD_WSTRING)
+#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_LOCALE)
 
 #include <boost/detail/workaround.hpp>
 
@@ -90 +90 @@
 #include <vector>
 #include <string>
 namespace boost{
+
+#ifndef BOOST_NO_STD_WSTRING
+    BOOST_PROGRAM_OPTIONS_DECL std::string
+    to_utf8(const std::wstring& s);
+
+    BOOST_PROGRAM_OPTIONS_DECL std::wstring
+    from_utf8(const std::string& s);
+
+    BOOST_PROGRAM_OPTIONS_DECL std::string
+    to_local_8_bit(const std::wstring& s);
+
+    BOOST_PROGRAM_OPTIONS_DECL std::wstring
+    from_local_8_bit(const std::string& s);
+#endif
+
    namespace program_options{
         BOOST_PROGRAM_OPTIONS_DECL std::string to_internal(const std::string&);
+#ifndef BOOST_NO_STD_WSTRING
+        BOOST_PROGRAM_OPTIONS_DECL std::string to_internal(const std::wstring& s);
+#endif
 
         template<class T>
         std::vector<std::string> to_internal(const std::vector<T>& s)

libs/program_options/src/convert.cpp

@@ -84 +84 @@
 
 namespace boost {
 
-#ifndef BOOST_NO_STD_WSTRING
+#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_LOCALE)
     BOOST_PROGRAM_OPTIONS_DECL std::wstring 
     from_8_bit(const std::string& s, 
                const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
@@ -142 +142 @@
     }
 #endif
 
+#ifdef BOOST_NO_STD_LOCALE
+    // these methods are NOT converting character sets!
+    BOOST_PROGRAM_OPTIONS_DECL std::string
+    to_utf8(const std::wstring& s)
+    {
+        return std::string(s.begin(), s.end());
+    }
+
+    BOOST_PROGRAM_OPTIONS_DECL std::wstring
+    from_utf8(const std::string& s)
+    {
+        return std::wstring(s.begin(), s.end());
+    }
+
+    BOOST_PROGRAM_OPTIONS_DECL std::string
+    to_local_8_bit(const std::wstring& s)
+    {
+        return std::string(s.begin(), s.end());
+    }
+
+    BOOST_PROGRAM_OPTIONS_DECL std::wstring
+    from_local_8_bit(const std::string& s)
+    {
+        return std::wstring(s.begin(), s.end());
+    }
+#endif
+
     namespace program_options
     {
         BOOST_PROGRAM_OPTIONS_DECL std::string to_internal(const std::string& s)