import new upstream nautilus stable release 14.2.8

[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..0262d2cf6cf653dc20322030f96288fd2a7ba53c 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,13 +7,15 @@
 
 //  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 Boost.Predef first so that windows.h is guaranteed to be not included
+#include <boost/predef/os/windows.h>
+#if BOOST_OS_WINDOWS
+#include <boost/winapi/config.hpp>
+#endif
 
-#ifndef BOOST_SYSTEM_NO_DEPRECATED 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
@@ -32,7 +34,7 @@
 #include <windows.h>
 
   std::codecvt_base::result windows_file_codecvt::do_in(
-    std::mbstate_t &, 
+    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
   {
@@ -40,7 +42,7 @@
 
     int count;
     if ((count = ::MultiByteToWideChar(codepage, MB_PRECOMPOSED, from,
-      from_end - from, to, to_end - to)) == 0) 
+      static_cast<int>(from_end - from), to, static_cast<int>(to_end - to))) == 0)
     {
       return error;  // conversion failed
     }
@@ -60,7 +62,7 @@
 
     int count;
     if ((count = ::WideCharToMultiByte(codepage, WC_NO_BEST_FIT_CHARS, from,
-      from_end - from, to, to_end - to, 0, 0)) == 0)
+      static_cast<int>(from_end - from), to, static_cast<int>(to_end - to), 0, 0)) == 0)
     {
       return error;  // conversion failed
     }