From cf7bb7fb68f47db272e29b9213c907c6ad5bcdca Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Mon, 3 Nov 2014 18:22:42 +0000 Subject: [PATCH] Relax the LLVM_NOEXCEPT _MSC_VER version check back to 1900 Unconditional noexcept support was added in the VS 2013 Nov CTP. Given that there have been three CTPs since then, I don't think we need careful macro magic to target that specific tech preview. Instead, target the major release version number of 1900, which corresponds to the as-yet unreleased VS "14". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221169 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 6fbd0f1a6b7..8a86ebdbf3a 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -66,7 +66,7 @@ #define LLVM_MSC_PREREQ(version) 0 #endif -#if !defined(_MSC_VER) || (defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190022129LL) +#if !defined(_MSC_VER) || defined(__clang__) || LLVM_MSC_PREREQ(1900) #define LLVM_NOEXCEPT noexcept #else #define LLVM_NOEXCEPT