Author: marshall Date: Fri Jul 13 10:24:59 2018 New Revision: 337027 URL: http://llvm.org/viewvc/llvm-project?rev=337027&view=rev Log: Shot in the dark to fix gcc 4.9 / c++11 build
Modified: libcxx/trunk/include/__config Modified: libcxx/trunk/include/__config URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=337027&r1=337026&r2=337027&view=diff ============================================================================== --- libcxx/trunk/include/__config (original) +++ libcxx/trunk/include/__config Fri Jul 13 10:24:59 2018 @@ -1024,10 +1024,10 @@ template <unsigned> struct __static_asse #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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits