aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/restricted/boost
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2023-08-15 00:50:12 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2023-08-15 11:53:05 +0300
commitafa5c44be459d9bfca05bf13a603b88148a3c860 (patch)
tree72ac290ecd10a9f73148daa2044fb8befe154830 /contrib/restricted/boost
parentb0ed18abdd30c3a78ec87bf8f59c38f2263e1bd1 (diff)
downloadydb-afa5c44be459d9bfca05bf13a603b88148a3c860.tar.gz
Update contrib/restricted/boost/assert to 1.83.0
Diffstat (limited to 'contrib/restricted/boost')
-rw-r--r--contrib/restricted/boost/assert/include/boost/assert/source_location.hpp5
-rw-r--r--contrib/restricted/boost/assert/ya.make4
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp b/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp
index 7b09e7cceb5..8b040c11a2e 100644
--- a/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp
+++ b/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp
@@ -157,7 +157,10 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
# define BOOST_CURRENT_LOCATION ::boost::source_location(__FILE__, BOOST_CURRENT_LOCATION_IMPL_1(__LINE__), "")
-#elif defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L
+#elif defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L && !defined(__NVCC__)
+
+// Under nvcc, __builtin_source_location is not constexpr
+// https://github.com/boostorg/assert/issues/32
# define BOOST_CURRENT_LOCATION ::boost::source_location(::std::source_location::current())
diff --git a/contrib/restricted/boost/assert/ya.make b/contrib/restricted/boost/assert/ya.make
index 2da6f3028af..7730822d2d4 100644
--- a/contrib/restricted/boost/assert/ya.make
+++ b/contrib/restricted/boost/assert/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(1.82.0)
+VERSION(1.83.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/assert/archive/boost-1.82.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/assert/archive/boost-1.83.0.tar.gz)
PEERDIR(
contrib/restricted/boost/config