diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-07-02 00:20:06 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-07-02 00:20:06 +0000 |
| commit | 745379a0af74a37465f616b99c10a09b4f0d2add (patch) | |
| tree | dbaa78e75fbc6ab68c2ac97ef5e9248d21a58d74 | |
| parent | adeab8d7541becf306f15d02cb56ee1a76fc1b5c (diff) | |
| download | bcm5719-llvm-745379a0af74a37465f616b99c10a09b4f0d2add.tar.gz bcm5719-llvm-745379a0af74a37465f616b99c10a09b4f0d2add.zip | |
Mark the newly added '__libcpp_is_constant_evaluated' as 'inline', since it can be included multiple times by multiple headers, and we don't want 'duplicate definition' errors.
llvm-svn: 364879
| -rw-r--r-- | libcxx/include/type_traits | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index c7e4749259a..f954a819ca8 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -4007,9 +4007,11 @@ inline constexpr bool is_constant_evaluated() noexcept { } #endif -_LIBCPP_CONSTEXPR bool __libcpp_is_constant_evaluated() _NOEXCEPT { return __builtin_is_constant_evaluated(); } +inline _LIBCPP_CONSTEXPR +bool __libcpp_is_constant_evaluated() _NOEXCEPT { return __builtin_is_constant_evaluated(); } #else -_LIBCPP_CONSTEXPR bool __libcpp_is_constant_evaluated() _NOEXCEPT { return false; } +inline _LIBCPP_CONSTEXPR +bool __libcpp_is_constant_evaluated() _NOEXCEPT { return false; } #endif template <class _CharT> |
