r258749 - Fix use of constexpr std::pair that's not in C++11.

Evgeniy Stepanov via cfe-commits cfe-commits at lists.llvm.org
Mon Jan 25 15:45:37 PST 2016


Author: eugenis
Date: Mon Jan 25 17:45:37 2016
New Revision: 258749

URL: http://llvm.org/viewvc/llvm-project?rev=258749&view=rev
Log:
Fix use of constexpr std::pair that's not in C++11.

Modified:
    cfe/trunk/lib/CodeGen/CGExpr.cpp

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=258749&r1=258748&r2=258749&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Mon Jan 25 17:45:37 2016
@@ -2636,7 +2636,7 @@ void CodeGenFunction::EmitCfiCheckFail()
   Address CheckKindAddr(V, getIntAlign());
   llvm::Value *CheckKind = Builder.CreateLoad(CheckKindAddr);
 
-  constexpr std::pair<int, SanitizerMask> CheckKinds[] = {
+  const std::pair<int, SanitizerMask> CheckKinds[] = {
       {CFITCK_VCall, SanitizerKind::CFIVCall},
       {CFITCK_NVCall, SanitizerKind::CFINVCall},
       {CFITCK_DerivedCast, SanitizerKind::CFIDerivedCast},




More information about the cfe-commits mailing list