import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / filesystem / src / windows_file_codecvt.cpp

diff --git a/ceph/src/boost/libs/filesystem/src/windows_file_codecvt.cpp b/ceph/src/boost/libs/filesystem/src/windows_file_codecvt.cpp
index 998db602212bdd1667777547d66f5d90aee2e4e2..abec47b007f3fe37d486d27836a8d8ae8ef5dd7b 100644 (file)
--- a/ceph/src/boost/libs/filesystem/src/windows_file_codecvt.cpp
+++ b/ceph/src/boost/libs/filesystem/src/windows_file_codecvt.cpp
@@ -7,69 +7,56 @@
 
 //  Library home page: http://www.boost.org/libs/filesystem
 
-//--------------------------------------------------------------------------------------// 
+//--------------------------------------------------------------------------------------//
 
-// define BOOST_FILESYSTEM_SOURCE so that <boost/system/config.hpp> knows
-// the library is being built (possibly exporting rather than importing code)
-#define BOOST_FILESYSTEM_SOURCE 
+#include "platform_config.hpp"
 
-#ifndef BOOST_SYSTEM_NO_DEPRECATED 
-# define BOOST_SYSTEM_NO_DEPRECATED
-#endif
-
-#include <boost/filesystem/config.hpp>
 #include <cwchar>  // for mbstate_t
 
 #ifdef BOOST_WINDOWS_API
 
 #include "windows_file_codecvt.hpp"
 
-// Versions of MinGW prior to GCC 4.6 requires this
-#ifndef WINVER
-# define WINVER 0x0500
-#endif
-
 #include <windows.h>
 
-  std::codecvt_base::result windows_file_codecvt::do_in(
-    std::mbstate_t &, 
-    const char* from, const char* from_end, const char*& from_next,
-    wchar_t* to, wchar_t* to_end, wchar_t*& to_next) const
+std::codecvt_base::result windows_file_codecvt::do_in(
+  std::mbstate_t &,
+  const char* from, const char* from_end, const char*& from_next,
+  wchar_t* to, wchar_t* to_end, wchar_t*& to_next) const
+{
+  UINT codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+
+  int count;
+  if ((count = ::MultiByteToWideChar(codepage, MB_PRECOMPOSED, from,
+    static_cast<int>(from_end - from), to, static_cast<int>(to_end - to))) == 0)
   {
-    UINT codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
-
-    int count;
-    if ((count = ::MultiByteToWideChar(codepage, MB_PRECOMPOSED, from,
-      from_end - from, to, to_end - to)) == 0) 
-    {
-      return error;  // conversion failed
-    }
-
-    from_next = from_end;
-    to_next = to + count;
-    *to_next = L'\0';
-    return ok;
- }
-
-  std::codecvt_base::result windows_file_codecvt::do_out(
-    std::mbstate_t &,
-    const wchar_t* from, const wchar_t* from_end, const wchar_t*  & from_next,
-    char* to, char* to_end, char* & to_next) const
+    return error;  // conversion failed
+  }
+
+  from_next = from_end;
+  to_next = to + count;
+  *to_next = L'\0';
+  return ok;
+}
+
+std::codecvt_base::result windows_file_codecvt::do_out(
+  std::mbstate_t &,
+  const wchar_t* from, const wchar_t* from_end, const wchar_t*  & from_next,
+  char* to, char* to_end, char* & to_next) const
+{
+  UINT codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+
+  int count;
+  if ((count = ::WideCharToMultiByte(codepage, WC_NO_BEST_FIT_CHARS, from,
+    static_cast<int>(from_end - from), to, static_cast<int>(to_end - to), 0, 0)) == 0)
   {
-    UINT codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
-
-    int count;
-    if ((count = ::WideCharToMultiByte(codepage, WC_NO_BEST_FIT_CHARS, from,
-      from_end - from, to, to_end - to, 0, 0)) == 0)
-    {
-      return error;  // conversion failed
-    }
-
-    from_next = from_end;
-    to_next = to + count;
-    *to_next = '\0';
-    return ok;
+    return error;  // conversion failed
   }
 
-  # endif  // BOOST_WINDOWS_API
+  from_next = from_end;
+  to_next = to + count;
+  *to_next = '\0';
+  return ok;
+}
 
+#endif  // BOOST_WINDOWS_API