diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2018-07-13 17:24:59 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2018-07-13 17:24:59 +0000 |
| commit | 2d1d690863f4df7157f35f2a6d1c666e9ebaf24a (patch) | |
| tree | 44447d994ece2b36e6ee70ed65bd566767344d96 | |
| parent | 327e7a16083c0bec70841288876815554e5f4367 (diff) | |
| download | bcm5719-llvm-2d1d690863f4df7157f35f2a6d1c666e9ebaf24a.tar.gz bcm5719-llvm-2d1d690863f4df7157f35f2a6d1c666e9ebaf24a.zip | |
Shot in the dark to fix gcc 4.9 / c++11 build
llvm-svn: 337027
| -rw-r--r-- | libcxx/include/__config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 87ba7e6e45f..65df5ddb93f 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1024,10 +1024,10 @@ template <unsigned> struct __static_assert_check {}; #endif #ifndef _LIBCPP_CONSTEXPR_IF_NODEBUG -#if !defined(_LIBCPP_DEBUG) && _LIBCPP_STD_VER >= 14 -#define _LIBCPP_CONSTEXPR_IF_NODEBUG constexpr -#else +#if defined(_LIBCPP_DEBUG) || _LIBCPP_HAS_NO_CXX14_CONSTEXPR #define _LIBCPP_CONSTEXPR_IF_NODEBUG +#else +#define _LIBCPP_CONSTEXPR_IF_NODEBUG constexpr #endif #endif |
