aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/cxxsupp/libcxxrt/memory.cc
diff options
context:
space:
mode:
authoritrofimow <itrofimow@yandex-team.com>2024-02-08 12:44:31 +0300
committeritrofimow <itrofimow@yandex-team.com>2024-02-08 13:38:13 +0300
commit486736e2393fd6541e7259e760b75ba24250ab36 (patch)
tree22201df9225ae50cc03d1face151f88ffd400de3 /contrib/libs/cxxsupp/libcxxrt/memory.cc
parent01d287e8a728fca6de124876147f7522a9a7ab00 (diff)
downloadydb-486736e2393fd6541e7259e760b75ba24250ab36.tar.gz
Update contrib/libs/cxxsupp/libcxxrt to 2024-02-06
Diffstat (limited to 'contrib/libs/cxxsupp/libcxxrt/memory.cc')
-rw-r--r--contrib/libs/cxxsupp/libcxxrt/memory.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/contrib/libs/cxxsupp/libcxxrt/memory.cc b/contrib/libs/cxxsupp/libcxxrt/memory.cc
index caa0aba79a..ef9eb415d7 100644
--- a/contrib/libs/cxxsupp/libcxxrt/memory.cc
+++ b/contrib/libs/cxxsupp/libcxxrt/memory.cc
@@ -73,10 +73,8 @@ namespace std
#if __cplusplus < 201103L
-#define NOEXCEPT noexcept
#define BADALLOC throw(std::bad_alloc)
#else
-#define NOEXCEPT noexcept
#define BADALLOC
#endif
@@ -138,14 +136,14 @@ void* operator new(size_t size) BADALLOC
__attribute__((weak))
-void* operator new(size_t size, const std::nothrow_t &) NOEXCEPT
+void* operator new(size_t size, const std::nothrow_t &) _LIBCXXRT_NOEXCEPT
{
return noexcept_new<(::operator new)>(size);
}
__attribute__((weak))
-void operator delete(void * ptr) NOEXCEPT
+void operator delete(void * ptr) _LIBCXXRT_NOEXCEPT
{
free(ptr);
}
@@ -159,14 +157,14 @@ void * operator new[](size_t size) BADALLOC
__attribute__((weak))
-void * operator new[](size_t size, const std::nothrow_t &) NOEXCEPT
+void * operator new[](size_t size, const std::nothrow_t &) _LIBCXXRT_NOEXCEPT
{
return noexcept_new<(::operator new[])>(size);
}
__attribute__((weak))
-void operator delete[](void * ptr) NOEXCEPT
+void operator delete[](void * ptr) _LIBCXXRT_NOEXCEPT
{
::operator delete(ptr);
}
@@ -176,14 +174,14 @@ void operator delete[](void * ptr) NOEXCEPT
#if __cplusplus >= 201402L
__attribute__((weak))
-void operator delete(void * ptr, size_t) NOEXCEPT
+void operator delete(void * ptr, size_t) _LIBCXXRT_NOEXCEPT
{
::operator delete(ptr);
}
__attribute__((weak))
-void operator delete[](void * ptr, size_t) NOEXCEPT
+void operator delete[](void * ptr, size_t) _LIBCXXRT_NOEXCEPT
{
::operator delete(ptr);
}