Author: ericwf Date: Wed Jul 25 15:07:36 2018 New Revision: 337974 URL: http://llvm.org/viewvc/llvm-project?rev=337974&view=rev Log: Fix GCC build in C++14 w/o c++14 constexpr
Modified: libcxx/trunk/src/experimental/filesystem/filesystem_common.h Modified: libcxx/trunk/src/experimental/filesystem/filesystem_common.h URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/experimental/filesystem/filesystem_common.h?rev=337974&r1=337973&r2=337974&view=diff ============================================================================== --- libcxx/trunk/src/experimental/filesystem/filesystem_common.h (original) +++ libcxx/trunk/src/experimental/filesystem/filesystem_common.h Wed Jul 25 15:07:36 2018 @@ -229,7 +229,7 @@ struct time_util_base { .count(); private: -#if _LIBCPP_STD_VER > 11 +#if _LIBCPP_STD_VER > 11 && !defined(_LIBCPP_HAS_NO_CXX14_CONSTEXPR) static constexpr fs_duration get_min_nsecs() { return duration_cast<fs_duration>( fs_nanoseconds(min_nsec_timespec) - _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits