diff options
-rw-r--r-- | contrib/restricted/boost/atomic/src/lock_pool.cpp | 4 | ||||
-rw-r--r-- | contrib/restricted/boost/atomic/src/wait_on_address.cpp | 6 | ||||
-rw-r--r-- | contrib/restricted/boost/atomic/ya.make | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/contrib/restricted/boost/atomic/src/lock_pool.cpp b/contrib/restricted/boost/atomic/src/lock_pool.cpp index adbea62526..7e92546cdf 100644 --- a/contrib/restricted/boost/atomic/src/lock_pool.cpp +++ b/contrib/restricted/boost/atomic/src/lock_pool.cpp @@ -1252,11 +1252,11 @@ wait_state_list::header* wait_state_list::allocate_buffer(std::size_t new_capaci const volatile void** old_a = get_atomic_pointers(old_header); std::memcpy(a, old_a, old_header->size * sizeof(const volatile void*)); - std::memset(a + old_header->size * sizeof(const volatile void*), 0, (new_capacity - old_header->size) * sizeof(const volatile void*)); + std::memset(a + old_header->size, 0, (new_capacity - old_header->size) * sizeof(const volatile void*)); wait_state** old_w = get_wait_states(old_a, old_header->capacity); std::memcpy(w, old_w, old_header->capacity * sizeof(wait_state*)); // copy spare wait state pointers - std::memset(w + old_header->capacity * sizeof(wait_state*), 0, (new_capacity - old_header->capacity) * sizeof(wait_state*)); + std::memset(w + old_header->capacity, 0, (new_capacity - old_header->capacity) * sizeof(wait_state*)); } else { diff --git a/contrib/restricted/boost/atomic/src/wait_on_address.cpp b/contrib/restricted/boost/atomic/src/wait_on_address.cpp index 9fc4b6d5fc..c103c2338d 100644 --- a/contrib/restricted/boost/atomic/src/wait_on_address.cpp +++ b/contrib/restricted/boost/atomic/src/wait_on_address.cpp @@ -65,11 +65,11 @@ BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT boost::winapi::HMODULE_ kernel_base = boost::winapi::get_module_handle(L"api-ms-win-core-synch-l1-2-0.dll"); if (BOOST_LIKELY(kernel_base != NULL)) { - wait_on_address_t* woa = (wait_on_address_t*)boost::winapi::get_proc_address(kernel_base, "WaitOnAddress"); + wait_on_address_t* woa = boost::winapi::get_proc_address<wait_on_address_t*>(kernel_base, "WaitOnAddress"); if (BOOST_LIKELY(woa != NULL)) { - wake_by_address_t* wbas = (wake_by_address_t*)boost::winapi::get_proc_address(kernel_base, "WakeByAddressSingle"); - wake_by_address_t* wbaa = (wake_by_address_t*)boost::winapi::get_proc_address(kernel_base, "WakeByAddressAll"); + wake_by_address_t* wbas = boost::winapi::get_proc_address<wake_by_address_t*>(kernel_base, "WakeByAddressSingle"); + wake_by_address_t* wbaa = boost::winapi::get_proc_address<wake_by_address_t*>(kernel_base, "WakeByAddressAll"); if (BOOST_LIKELY(wbas != NULL && wbaa != NULL)) { diff --git a/contrib/restricted/boost/atomic/ya.make b/contrib/restricted/boost/atomic/ya.make index b207f3be82..9cf20d6826 100644 --- a/contrib/restricted/boost/atomic/ya.make +++ b/contrib/restricted/boost/atomic/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.86.0) +VERSION(1.87.0) -ORIGINAL_SOURCE(https://github.com/boostorg/atomic/archive/boost-1.86.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/atomic/archive/boost-1.87.0.tar.gz) PEERDIR( contrib/restricted/boost/align |