From fc46c683102eaa4682ea0c244974d94366687ffb Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 31 Oct 2014 23:02:40 +0000 Subject: [PATCH] Define LLVM_NOEXCEPT with MSVC 14 CTP 3 or newer We have to use _MSC_FULL_VER here as CTP 2 and earlier didn't define noexcept to my knowledge. Fixes build error in lib/Support/Error.cpp when inheriting from std::error_category, which has a noexcept virtual method. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221013 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 753910f4bbc..6fbd0f1a6b7 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -66,7 +66,7 @@ #define LLVM_MSC_PREREQ(version) 0 #endif -#ifndef _MSC_VER +#if !defined(_MSC_VER) || (defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190022129LL) #define LLVM_NOEXCEPT noexcept #else #define LLVM_NOEXCEPT -- 2.34.1