diff options
author | Louis Dionne <ldionne@apple.com> | 2018-08-01 02:08:59 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2018-08-01 02:08:59 +0000 |
commit | 6952d1478ddd5a1870079d01f1a0e1eea5b09a1a (patch) | |
tree | 9decc6ed78b735b0e7d1e36cd23a7d3c40a529e7 | |
parent | 36fc7371891fd73ba9a86dd4e62421866ecc5901 (diff) |
[libc++] Remove _LIBCPP_BUILDING_XXX macros, which are redundant since _LIBCPP_BUILDING_LIBRARY
Summary: As suggested by Marshall in https://reviews.llvm.org/D49914
Reviewers: mclow.lists, EricWF
Subscribers: christof, dexonsmith, cfe-commits
Differential Revision: https://reviews.llvm.org/D50008
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@338475 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/__functional_base | 2 | ||||
-rw-r--r-- | include/__mutex_base | 2 | ||||
-rw-r--r-- | include/functional | 4 | ||||
-rw-r--r-- | include/memory | 6 | ||||
-rw-r--r-- | include/new | 6 | ||||
-rw-r--r-- | include/shared_mutex | 2 | ||||
-rw-r--r-- | include/system_error | 2 | ||||
-rw-r--r-- | include/utility | 2 | ||||
-rw-r--r-- | src/bind.cpp | 1 | ||||
-rw-r--r-- | src/memory.cpp | 1 | ||||
-rw-r--r-- | src/mutex.cpp | 1 | ||||
-rw-r--r-- | src/new.cpp | 2 | ||||
-rw-r--r-- | src/shared_mutex.cpp | 1 | ||||
-rw-r--r-- | src/system_error.cpp | 1 | ||||
-rw-r--r-- | src/utility.cpp | 1 |
15 files changed, 13 insertions, 21 deletions
diff --git a/include/__functional_base b/include/__functional_base index 1a90bd628..57fdf2b9f 100644 --- a/include/__functional_base +++ b/include/__functional_base @@ -561,7 +561,7 @@ struct __is_transparent<_Tp, _Up, struct _LIBCPP_TEMPLATE_VIS allocator_arg_t { }; -#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_MEMORY) +#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) extern const allocator_arg_t allocator_arg; #else /* _LIBCPP_INLINE_VAR */ constexpr allocator_arg_t allocator_arg = allocator_arg_t(); diff --git a/include/__mutex_base b/include/__mutex_base index 402a52d94..4659ca929 100644 --- a/include/__mutex_base +++ b/include/__mutex_base @@ -74,7 +74,7 @@ struct _LIBCPP_TYPE_VIS defer_lock_t {}; struct _LIBCPP_TYPE_VIS try_to_lock_t {}; struct _LIBCPP_TYPE_VIS adopt_lock_t {}; -#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_MUTEX) +#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) extern const defer_lock_t defer_lock; extern const try_to_lock_t try_to_lock; diff --git a/include/functional b/include/functional index 80261895e..6b70f731e 100644 --- a/include/functional +++ b/include/functional @@ -2005,7 +2005,7 @@ namespace placeholders template <int _Np> struct __ph {}; -#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_BIND) +#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) _LIBCPP_FUNC_VIS extern const __ph<1> _1; _LIBCPP_FUNC_VIS extern const __ph<2> _2; _LIBCPP_FUNC_VIS extern const __ph<3> _3; @@ -2027,7 +2027,7 @@ _LIBCPP_FUNC_VIS extern const __ph<10> _10; /* _LIBCPP_INLINE_VAR */ constexpr __ph<8> _8{}; /* _LIBCPP_INLINE_VAR */ constexpr __ph<9> _9{}; /* _LIBCPP_INLINE_VAR */ constexpr __ph<10> _10{}; -#endif // defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_BIND) +#endif // defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) } // placeholders diff --git a/include/memory b/include/memory index fd830d7ed..a4bf89b49 100644 --- a/include/memory +++ b/include/memory @@ -3511,7 +3511,7 @@ public: explicit __shared_count(long __refs = 0) _NOEXCEPT : __shared_owners_(__refs) {} -#if defined(_LIBCPP_BUILDING_MEMORY) && \ +#if defined(_LIBCPP_BUILDING_LIBRARY) && \ defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS) void __add_shared() _NOEXCEPT; bool __release_shared() _NOEXCEPT; @@ -3549,7 +3549,7 @@ protected: virtual ~__shared_weak_count(); public: -#if defined(_LIBCPP_BUILDING_MEMORY) && \ +#if defined(_LIBCPP_BUILDING_LIBRARY) && \ defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS) void __add_shared() _NOEXCEPT; void __add_weak() _NOEXCEPT; @@ -5549,7 +5549,7 @@ struct _LIBCPP_TYPE_VIS pointer_safety #endif #if !defined(_LIBCPP_ABI_POINTER_SAFETY_ENUM_TYPE) && \ - defined(_LIBCPP_BUILDING_MEMORY) + defined(_LIBCPP_BUILDING_LIBRARY) _LIBCPP_FUNC_VIS pointer_safety get_pointer_safety() _NOEXCEPT; #else // This function is only offered in C++03 under ABI v1. diff --git a/include/new b/include/new index b5dc05542..e70b9c621 100644 --- a/include/new +++ b/include/new @@ -103,13 +103,13 @@ void operator delete[](void* ptr, void*) noexcept; #pragma GCC system_header #endif -#if !(defined(_LIBCPP_BUILDING_NEW) || _LIBCPP_STD_VER >= 14 || \ +#if !(defined(_LIBCPP_BUILDING_LIBRARY) || _LIBCPP_STD_VER >= 14 || \ (defined(__cpp_sized_deallocation) && __cpp_sized_deallocation >= 201309)) # define _LIBCPP_HAS_NO_SIZED_DEALLOCATION #endif #if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) && \ - (!(defined(_LIBCPP_BUILDING_NEW) || _LIBCPP_STD_VER > 14 || \ + (!(defined(_LIBCPP_BUILDING_LIBRARY) || _LIBCPP_STD_VER > 14 || \ (defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606))) # define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION #endif @@ -167,7 +167,7 @@ public: #define _LIBCPP_BAD_ARRAY_LENGTH_DEFINED -#endif // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11) +#endif // defined(_LIBCPP_BUILDING_LIBRARY) || (_LIBCPP_STD_VER > 11) #if !defined(_LIBCPP_ABI_MICROSOFT) || defined(_LIBCPP_NO_VCRUNTIME) #if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) || _LIBCPP_STD_VER > 14 diff --git a/include/shared_mutex b/include/shared_mutex index 9cb81528c..a7735d673 100644 --- a/include/shared_mutex +++ b/include/shared_mutex @@ -129,7 +129,7 @@ _LIBCPP_PUSH_MACROS #include <__undef_macros> -#if _LIBCPP_STD_VER > 11 || defined(_LIBCPP_BUILDING_SHARED_MUTEX) +#if _LIBCPP_STD_VER > 11 || defined(_LIBCPP_BUILDING_LIBRARY) #include <__mutex_base> diff --git a/include/system_error b/include/system_error index 917c71029..6e2c8388f 100644 --- a/include/system_error +++ b/include/system_error @@ -199,7 +199,7 @@ class _LIBCPP_TYPE_VIS error_category public: virtual ~error_category() _NOEXCEPT; -#if defined(_LIBCPP_BUILDING_SYSTEM_ERROR) && \ +#if defined(_LIBCPP_BUILDING_LIBRARY) && \ defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS) error_category() _NOEXCEPT; #else diff --git a/include/utility b/include/utility index 8fdaf65db..ed9bf030d 100644 --- a/include/utility +++ b/include/utility @@ -295,7 +295,7 @@ template <class _Tp> void as_const(const _Tp&&) = delete; #endif struct _LIBCPP_TEMPLATE_VIS piecewise_construct_t { }; -#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_UTILITY) +#if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t(); #else /* _LIBCPP_INLINE_VAR */ constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); diff --git a/src/bind.cpp b/src/bind.cpp index b318fc169..b4c76ffe6 100644 --- a/src/bind.cpp +++ b/src/bind.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_BUILDING_BIND #include "functional" _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/src/memory.cpp b/src/memory.cpp index 4e0d3af91..77ebe837c 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_BUILDING_MEMORY #include "memory" #ifndef _LIBCPP_HAS_NO_THREADS #include "mutex" diff --git a/src/mutex.cpp b/src/mutex.cpp index c36bd5549..c61d34bb8 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_BUILDING_MUTEX #include "mutex" #include "limits" #include "system_error" diff --git a/src/new.cpp b/src/new.cpp index e228a0d83..8013d89ae 100644 --- a/src/new.cpp +++ b/src/new.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_BUILDING_NEW - #include <stdlib.h> #include "new" diff --git a/src/shared_mutex.cpp b/src/shared_mutex.cpp index 874aceb1b..6185f15de 100644 --- a/src/shared_mutex.cpp +++ b/src/shared_mutex.cpp @@ -10,7 +10,6 @@ #include "__config" #ifndef _LIBCPP_HAS_NO_THREADS -#define _LIBCPP_BUILDING_SHARED_MUTEX #include "shared_mutex" _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/src/system_error.cpp b/src/system_error.cpp index 72623ea6b..06caa6fec 100644 --- a/src/system_error.cpp +++ b/src/system_error.cpp @@ -9,7 +9,6 @@ #include "__config" -#define _LIBCPP_BUILDING_SYSTEM_ERROR #include "system_error" #include "include/config_elast.h" diff --git a/src/utility.cpp b/src/utility.cpp index e9830e7c2..7dccffb73 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -#define _LIBCPP_BUILDING_UTILITY #include "utility" _LIBCPP_BEGIN_NAMESPACE_STD |