diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index 91a63f537662..97192bc788f3 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/src/cxa_default_handlers.cpp @@ -8,10 +8,8 @@ // This file implements the default terminate_handler and unexpected_handler. //===----------------------------------------------------------------------===// -#include -#include #include -#include +#include #include "abort_message.h" #include "cxxabi.h" #include "cxa_handlers.h" @@ -87,7 +85,7 @@ static void demangling_unexpected_handler() static std::terminate_handler default_terminate_handler = demangling_terminate_handler; static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler; #else -static std::terminate_handler default_terminate_handler = std::abort; +static std::terminate_handler default_terminate_handler = ::abort; static std::terminate_handler default_unexpected_handler = std::terminate; #endif diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp index 7d56c424e629..54bd1dff3994 100644 --- a/libcxxabi/src/cxa_exception.cpp +++ b/libcxxabi/src/cxa_exception.cpp @@ -13,7 +13,7 @@ #include "cxxabi.h" #include // for std::terminate -#include // for memset +#include // for memset #include "cxa_exception.h" #include "cxa_handlers.h" #include "fallback_malloc.h" @@ -163,13 +163,12 @@ static size_t get_cxa_exception_offset() { } __attribute__((aligned)); // Compute the maximum alignment for the target machine. - constexpr size_t alignment = std::alignment_of::value; + constexpr size_t alignment = alignof(S); constexpr size_t excp_size = sizeof(__cxa_exception); constexpr size_t aligned_size = (excp_size + alignment - 1) / alignment * alignment; constexpr size_t offset = aligned_size - excp_size; - static_assert((offset == 0 || - std::alignment_of<_Unwind_Exception>::value < alignment), + static_assert((offset == 0 || alignof(_Unwind_Exception) < alignment), "offset is non-zero only if _Unwind_Exception isn't aligned"); return offset; } @@ -193,7 +192,7 @@ void *__cxa_allocate_exception(size_t thrown_size) throw() { std::terminate(); __cxa_exception *exception_header = static_cast<__cxa_exception *>((void *)(raw_buffer + header_offset)); - std::memset(exception_header, 0, actual_size); + ::memset(exception_header, 0, actual_size); return thrown_object_from_cxa_exception(exception_header); } @@ -216,7 +215,7 @@ void * __cxa_allocate_dependent_exception () { void *ptr = __aligned_malloc_with_fallback(actual_size); if (NULL == ptr) std::terminate(); - std::memset(ptr, 0, actual_size); + ::memset(ptr, 0, actual_size); return ptr; } diff --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp index 392403bd047c..923b265b27c2 100644 --- a/libcxxabi/src/cxa_thread_atexit.cpp +++ b/libcxxabi/src/cxa_thread_atexit.cpp @@ -15,7 +15,7 @@ #endif #endif -#include +#include namespace __cxxabiv1 { @@ -77,7 +77,7 @@ namespace { while (auto head = dtors) { dtors = head->next; head->dtor(head->obj); - std::free(head); + ::free(head); } dtors_alive = false; @@ -126,7 +126,7 @@ extern "C" { dtors_alive = true; } - auto head = static_cast(std::malloc(sizeof(DtorList))); + auto head = static_cast(::malloc(sizeof(DtorList))); if (!head) { return -1; } diff --git a/libcxxabi/src/cxa_vector.cpp b/libcxxabi/src/cxa_vector.cpp index cc358f05e005..f20e978d36ef 100644 --- a/libcxxabi/src/cxa_vector.cpp +++ b/libcxxabi/src/cxa_vector.cpp @@ -14,7 +14,7 @@ #include "__cxxabi_config.h" #include // for std::terminate -#include // for std::bad_alloc +#include // for std::bad_array_new_length #include "abort_message.h" diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp index 9d6240752a1a..8f301bcacd14 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -18,8 +18,8 @@ #endif #endif -#include // for malloc, calloc, free -#include // for memset +#include // for malloc, calloc, free +#include // for memset // A small, simple heap manager based (loosely) on // the startup heap manager from FreeBSD, optimized for space. @@ -214,7 +214,7 @@ void* __aligned_malloc_with_fallback(size_t size) { if (void* dest = _aligned_malloc(size, alignof(__aligned_type))) return dest; #elif defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) - if (void* dest = std::malloc(size)) + if (void* dest = ::malloc(size)) return dest; #else if (size == 0) @@ -227,13 +227,13 @@ void* __aligned_malloc_with_fallback(size_t size) { } void* __calloc_with_fallback(size_t count, size_t size) { - void* ptr = std::calloc(count, size); + void* ptr = ::calloc(count, size); if (NULL != ptr) return ptr; // if calloc fails, fall back to emergency stash ptr = fallback_malloc(size * count); if (NULL != ptr) - std::memset(ptr, 0, size * count); + ::memset(ptr, 0, size * count); return ptr; } @@ -244,7 +244,7 @@ void __aligned_free_with_fallback(void* ptr) { #if defined(_WIN32) ::_aligned_free(ptr); #else - std::free(ptr); + ::free(ptr); #endif } } @@ -253,7 +253,7 @@ void __free_with_fallback(void* ptr) { if (is_fallback_ptr(ptr)) fallback_free(ptr); else - std::free(ptr); + ::free(ptr); } } // namespace __cxxabiv1 diff --git a/libcxxabi/src/fallback_malloc.h b/libcxxabi/src/fallback_malloc.h index 033ecd63d1e1..57808545197b 100644 --- a/libcxxabi/src/fallback_malloc.h +++ b/libcxxabi/src/fallback_malloc.h @@ -10,7 +10,7 @@ #define _FALLBACK_MALLOC_H #include "__cxxabi_config.h" -#include // for size_t +#include // for size_t namespace __cxxabiv1 { diff --git a/libcxxabi/src/private_typeinfo.h b/libcxxabi/src/private_typeinfo.h index d7f3f830ba2c..cf680d6b1f2f 100644 --- a/libcxxabi/src/private_typeinfo.h +++ b/libcxxabi/src/private_typeinfo.h @@ -12,7 +12,7 @@ #include "__cxxabi_config.h" #include -#include +#include namespace __cxxabiv1 { @@ -72,7 +72,7 @@ struct _LIBCXXABI_HIDDEN __dynamic_cast_info const __class_type_info* dst_type; const void* static_ptr; const __class_type_info* static_type; - std::ptrdiff_t src2dst_offset; + ptrdiff_t src2dst_offset; // Data that represents the answer: