diff options
| -rw-r--r-- | libcxx/include/utility | 2 | ||||
| -rw-r--r-- | libcxx/src/utility.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index a12ed91e719..279d4218882 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -206,7 +206,7 @@ move_if_noexcept(_Tp& __x) _NOEXCEPT } struct _LIBCPP_VISIBLE piecewise_construct_t { }; -#ifdef _LIBCPP_HAS_NO_CONSTEXPR +#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_UTILITY) extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t(); #else constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); diff --git a/libcxx/src/utility.cpp b/libcxx/src/utility.cpp index deb5ffa0077..e9830e7c24f 100644 --- a/libcxx/src/utility.cpp +++ b/libcxx/src/utility.cpp @@ -7,12 +7,11 @@ // //===----------------------------------------------------------------------===// +#define _LIBCPP_BUILDING_UTILITY #include "utility" _LIBCPP_BEGIN_NAMESPACE_STD -#ifdef _LIBCPP_HAS_NO_CONSTEXPR const piecewise_construct_t piecewise_construct = {}; -#endif _LIBCPP_END_NAMESPACE_STD |
