diff options
author | robot-contrib <[email protected]> | 2025-08-27 11:07:41 +0300 |
---|---|---|
committer | robot-contrib <[email protected]> | 2025-08-27 11:32:39 +0300 |
commit | e2b0632237c8220c9302749b588ce13a5cf13b3c (patch) | |
tree | e4851ada902023b20e97f597ffa5727b6200d10d | |
parent | 1462fc75b21e6ae4e2029e95fbc1df56af3b355d (diff) |
Update contrib/restricted/boost/winapi to 1.89.0
commit_hash:83a607cce09d6373cbe92f995edf1c24f7acc1c4
-rw-r--r-- | contrib/restricted/boost/winapi/.yandex_meta/default.nix | 4 | ||||
-rw-r--r-- | contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp | 16 | ||||
-rw-r--r-- | contrib/restricted/boost/winapi/ya.make | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/contrib/restricted/boost/winapi/.yandex_meta/default.nix b/contrib/restricted/boost/winapi/.yandex_meta/default.nix index 35497b9ee8a..d738972afa4 100644 --- a/contrib/restricted/boost/winapi/.yandex_meta/default.nix +++ b/contrib/restricted/boost/winapi/.yandex_meta/default.nix @@ -1,13 +1,13 @@ self: super: with self; { boost_winapi = stdenv.mkDerivation rec { pname = "boost_winapi"; - version = "1.88.0"; + version = "1.89.0"; src = fetchFromGitHub { owner = "boostorg"; repo = "winapi"; rev = "boost-${version}"; - hash = "sha256-6K3opuoL0D4DkoicUEpTM2H3FRZZwPIi+ouDXN821JQ="; + hash = "sha256-bqgQoKsXrXj3GeHdE0TM34VCXPkydLrUlXEhWb1lwiw="; }; }; } diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp index 0f19658d4ad..328d3242b49 100644 --- a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp +++ b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp @@ -16,7 +16,7 @@ #pragma once #endif -#if !defined( BOOST_USE_WINDOWS_H ) +#if !defined(BOOST_USE_WINDOWS_H) extern "C" { BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC CloseHandle(boost::winapi::HANDLE_ handle); @@ -30,13 +30,18 @@ DuplicateHandle( boost::winapi::DWORD_ dwDesiredAccess, boost::winapi::BOOL_ bInheritHandle, boost::winapi::DWORD_ dwOptions); +} // extern "C" +#endif -#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM) +#if (!defined(BOOST_USE_WINDOWS_H) || (defined(BOOST_WINAPI_IS_MINGW_W64) && (__MINGW64_VERSION_MAJOR >= 6) && (__MINGW64_VERSION_MAJOR < 9))) && \ + (BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM)) +extern "C" { +// Older MinGW-w64 do not have this declaration. It is present when __MINGW64_VERSION_MAJOR is 9 or greater, which is the case +// in 8.0.1 (specifically, not earlier or later 8.x) and 9.0.0 and onwards. Library exports seem to be present since 6.0.0. BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC CompareObjectHandles( boost::winapi::HANDLE_ hFirstObjectHandle, boost::winapi::HANDLE_ hSecondObjectHandle); -#endif } // extern "C" #endif @@ -46,12 +51,13 @@ namespace winapi { using ::CloseHandle; using ::DuplicateHandle; -#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM) +#if (!defined(BOOST_WINAPI_IS_MINGW_W64) || (__MINGW64_VERSION_MAJOR >= 6)) && \ + (BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM)) using ::CompareObjectHandles; #endif // Note: MSVC-14.1 does not interpret INVALID_HANDLE_VALUE_ initializer as a constant expression -#if defined( BOOST_USE_WINDOWS_H ) +#if defined(BOOST_USE_WINDOWS_H) BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_CLOSE_SOURCE_ = DUPLICATE_CLOSE_SOURCE; BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_SAME_ACCESS_ = DUPLICATE_SAME_ACCESS; const HANDLE_ INVALID_HANDLE_VALUE_ = INVALID_HANDLE_VALUE; diff --git a/contrib/restricted/boost/winapi/ya.make b/contrib/restricted/boost/winapi/ya.make index 330c4fa2927..bf660f4ac62 100644 --- a/contrib/restricted/boost/winapi/ya.make +++ b/contrib/restricted/boost/winapi/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.88.0) +VERSION(1.89.0) -ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.88.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.89.0.tar.gz) PEERDIR( contrib/restricted/boost/config |