import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / winapi / character_code_conversion.hpp

diff --git a/ceph/src/boost/boost/winapi/character_code_conversion.hpp b/ceph/src/boost/boost/winapi/character_code_conversion.hpp
index c13f873f954093d552d7a11343f6715554fb227b..af5148609c916f3df9d3742587edfc9bcb6d1b33 100644 (file)
--- a/ceph/src/boost/boost/winapi/character_code_conversion.hpp
+++ b/ceph/src/boost/boost/winapi/character_code_conversion.hpp
@@ -17,7 +17,7 @@
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 
-BOOST_SYMBOL_IMPORT int WINAPI
+BOOST_SYMBOL_IMPORT int BOOST_WINAPI_WINAPI_CC
 MultiByteToWideChar(
     boost::winapi::UINT_ CodePage,
     boost::winapi::DWORD_ dwFlags,
@@ -26,7 +26,7 @@ MultiByteToWideChar(
     boost::winapi::LPWSTR_ lpWideCharStr,
     int cchWideChar);
 
-BOOST_SYMBOL_IMPORT int WINAPI
+BOOST_SYMBOL_IMPORT int BOOST_WINAPI_WINAPI_CC
 WideCharToMultiByte(
     boost::winapi::UINT_ CodePage,
     boost::winapi::DWORD_ dwFlags,
@@ -45,55 +45,55 @@ namespace winapi {
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const UINT_ CP_ACP_ = CP_ACP;
-const UINT_ CP_OEMCP_ = CP_OEMCP;
-const UINT_ CP_MACCP_ = CP_MACCP;
-const UINT_ CP_THREAD_ACP_ = CP_THREAD_ACP;
-const UINT_ CP_SYMBOL_ = CP_SYMBOL;
-const UINT_ CP_UTF7_ = CP_UTF7;
-const UINT_ CP_UTF8_ = CP_UTF8;
-
-const DWORD_ MB_PRECOMPOSED_ = MB_PRECOMPOSED;
-const DWORD_ MB_COMPOSITE_ = MB_COMPOSITE;
-const DWORD_ MB_USEGLYPHCHARS_ = MB_USEGLYPHCHARS;
-const DWORD_ MB_ERR_INVALID_CHARS_ = MB_ERR_INVALID_CHARS;
-
-const DWORD_ WC_COMPOSITECHECK_ = WC_COMPOSITECHECK;
-const DWORD_ WC_DISCARDNS_ = WC_DISCARDNS;
-const DWORD_ WC_SEPCHARS_ = WC_SEPCHARS;
-const DWORD_ WC_DEFAULTCHAR_ = WC_DEFAULTCHAR;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_ACP_ = CP_ACP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_OEMCP_ = CP_OEMCP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_MACCP_ = CP_MACCP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_THREAD_ACP_ = CP_THREAD_ACP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_SYMBOL_ = CP_SYMBOL;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF7_ = CP_UTF7;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF8_ = CP_UTF8;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_PRECOMPOSED_ = MB_PRECOMPOSED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_COMPOSITE_ = MB_COMPOSITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_USEGLYPHCHARS_ = MB_USEGLYPHCHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_ERR_INVALID_CHARS_ = MB_ERR_INVALID_CHARS;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_COMPOSITECHECK_ = WC_COMPOSITECHECK;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DISCARDNS_ = WC_DISCARDNS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_SEPCHARS_ = WC_SEPCHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DEFAULTCHAR_ = WC_DEFAULTCHAR;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
-const DWORD_ WC_NO_BEST_FIT_CHARS_ = WC_NO_BEST_FIT_CHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_NO_BEST_FIT_CHARS_ = WC_NO_BEST_FIT_CHARS;
 #endif
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const UINT_ CP_ACP_ = 0u;
-const UINT_ CP_OEMCP_ = 1u;
-const UINT_ CP_MACCP_ = 2u;
-const UINT_ CP_THREAD_ACP_ = 3u;
-const UINT_ CP_SYMBOL_ = 42u;
-const UINT_ CP_UTF7_ = 65000u;
-const UINT_ CP_UTF8_ = 65001u;
-
-const DWORD_ MB_PRECOMPOSED_ = 0x00000001;
-const DWORD_ MB_COMPOSITE_ = 0x00000002;
-const DWORD_ MB_USEGLYPHCHARS_ = 0x00000004;
-const DWORD_ MB_ERR_INVALID_CHARS_ = 0x00000008;
-
-const DWORD_ WC_COMPOSITECHECK_ = 0x00000200;
-const DWORD_ WC_DISCARDNS_ = 0x00000010;
-const DWORD_ WC_SEPCHARS_ = 0x00000020;
-const DWORD_ WC_DEFAULTCHAR_ = 0x00000040;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_ACP_ = 0u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_OEMCP_ = 1u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_MACCP_ = 2u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_THREAD_ACP_ = 3u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_SYMBOL_ = 42u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF7_ = 65000u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF8_ = 65001u;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_PRECOMPOSED_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_COMPOSITE_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_USEGLYPHCHARS_ = 0x00000004;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_ERR_INVALID_CHARS_ = 0x00000008;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_COMPOSITECHECK_ = 0x00000200;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DISCARDNS_ = 0x00000010;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_SEPCHARS_ = 0x00000020;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DEFAULTCHAR_ = 0x00000040;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
-const DWORD_ WC_NO_BEST_FIT_CHARS_ = 0x00000400;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_NO_BEST_FIT_CHARS_ = 0x00000400;
 #endif
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 // This constant is not present in MinGW
-const DWORD_ WC_ERR_INVALID_CHARS_ = 0x00000080;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_ERR_INVALID_CHARS_ = 0x00000080;
 #endif
 
 using ::MultiByteToWideChar;