Skip to content

Commit 0245f52

Browse files
authored
Merge pull request #8013 from ydb-platform/mergelibs-240819-1422
Library import 240819-1422
2 parents d3dd3a7 + 7f8cd26 commit 0245f52

File tree

9 files changed

+27
-11
lines changed

9 files changed

+27
-11
lines changed

build/platform/yfm/ya.make

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
RESOURCES_LIBRARY()
2+
3+
IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
4+
MESSAGE(FATAL_ERROR Unsupported platform for YFM tool)
5+
ENDIF()
6+
7+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
8+
YFM_TOOL
9+
sbr:6662972834 FOR DARWIN-ARM64
10+
sbr:6662972834 FOR DARWIN
11+
sbr:6662965433 FOR LINUX
12+
sbr:6662980150 FOR WIN32
13+
)
14+
15+
END()

contrib/restricted/boost/iterator/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(1.85.0)
9+
VERSION(1.86.0)
1010

11-
ORIGINAL_SOURCE(https://github.com/boostorg/iterator/archive/boost-1.85.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/boostorg/iterator/archive/boost-1.86.0.tar.gz)
1212

1313
PEERDIR(
1414
contrib/restricted/boost/assert

contrib/restricted/boost/parameter/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(1.85.0)
9+
VERSION(1.86.0)
1010

11-
ORIGINAL_SOURCE(https://github.com/boostorg/parameter/archive/boost-1.85.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/boostorg/parameter/archive/boost-1.86.0.tar.gz)
1212

1313
PEERDIR(
1414
contrib/restricted/boost/config

contrib/restricted/boost/winapi/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(1.85.0)
9+
VERSION(1.86.0)
1010

11-
ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.85.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.86.0.tar.gz)
1212

1313
PEERDIR(
1414
contrib/restricted/boost/config

library/cpp/threading/future/core/future-inl.h

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#if !defined(INCLUDE_FUTURE_INL_H)
44
#error "you should never include future-inl.h directly"
5+
#include "future.h" // Fix LSP
56
#endif // INCLUDE_FUTURE_INL_H
67

78
namespace NThreading {

ydb/ci/rightlib.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
abc97e34e52829991fc3b643ad04967863492ea8
1+
6736ef52165b42c9537dc7e81346c5ef1568f2a1

yt/yt/core/misc/collection_helpers-inl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ std::vector<std::pair<typename T::key_type, typename T::mapped_type>> SortHashMa
319319
template <class T>
320320
void EnsureVectorSize(std::vector<T>& vector, ssize_t size, const T& defaultValue)
321321
{
322-
if (static_cast<ssize_t>(vector.size()) < size) {
322+
if (std::ssize(vector) < size) {
323323
vector.resize(size, defaultValue);
324324
}
325325
}
@@ -347,7 +347,7 @@ void AssignVectorAt(std::vector<T>& vector, ssize_t index, T&& value, const T& d
347347
template <class T>
348348
const T& VectorAtOr(const std::vector<T>& vector, ssize_t index, const T& defaultValue)
349349
{
350-
return index < static_cast<ssize_t>(vector.size()) ? vector[index] : defaultValue;
350+
return index < std::ssize(vector) ? vector[index] : defaultValue;
351351
}
352352

353353
////////////////////////////////////////////////////////////////////////////////

yt/yt/core/misc/stripped_error.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ TOriginAttributes* TError::MutableOriginAttributes() const noexcept
492492
return Impl_->MutableOriginAttributes();
493493
}
494494

495-
void TError::SetAttributes(NYTree::IAttributeDictionaryPtr attributes) noexcept
495+
void TError::SetAttributes(NYTree::IAttributeDictionaryPtr attributes)
496496
{
497497
if (!Impl_) {
498498
return;

yt/yt/core/misc/stripped_error.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class [[nodiscard]] TErrorOr<void>
149149

150150
// Used for deserialization only.
151151
TOriginAttributes* MutableOriginAttributes() const noexcept;
152-
void SetAttributes(NYTree::IAttributeDictionaryPtr attributes) noexcept;
152+
void SetAttributes(NYTree::IAttributeDictionaryPtr attributes);
153153

154154
TError Truncate(
155155
int maxInnerErrorCount = 2,

0 commit comments

Comments
 (0)