diff options
Diffstat (limited to 'llvm/include')
| -rw-r--r-- | llvm/include/llvm/ADT/StringRef.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/include/llvm/ADT/StringRef.h b/llvm/include/llvm/ADT/StringRef.h index 6d75cf8b04e..7c13b5d17ec 100644 --- a/llvm/include/llvm/ADT/StringRef.h +++ b/llvm/include/llvm/ADT/StringRef.h @@ -24,7 +24,7 @@ // Declare the __builtin_strlen intrinsic for MSVC so it can be used in // constexpr context. #if defined(_MSC_VER) -extern "C" constexpr size_t __builtin_strlen(const char *); +extern "C" size_t __builtin_strlen(const char *); #endif namespace llvm { @@ -77,7 +77,8 @@ namespace llvm { static constexpr size_t strLen(const char *Str) { #if __cplusplus > 201402L return std::char_traits<char>::length(Str); -#elif __has_builtin(__builtin_strlen) || defined(__GNUC__) || defined(_MSC_VER) +#elif __has_builtin(__builtin_strlen) || defined(__GNUC__) || \ + (defined(_MSC_VER) && _MSC_VER >= 1920) return __builtin_strlen(Str); #else const char *Begin = Str; |
