From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Mon, 25 Jan 2016 23:45:37 +0000 (+0000)
Subject: Fix use of constexpr std::pair that's not in C++11.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32fea4edd4ffff0d1b829b85534f3712f48d343f;p=clang

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@258749 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index d1682e2930..10547a4ecf 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -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},