From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 21 May 2015 01:26:53 +0000 (+0000)
Subject: Avoid using a C++11 library feature not present in libstdc++4.7.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2895be058a34f32bd85623c76d96790540ccd39a;p=clang

Avoid using a C++11 library feature not present in libstdc++4.7.


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

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 027daae4be..e68fb7df8e 100644
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -627,8 +627,7 @@ void Preprocessor::EnterSubmodule(Module *M, SourceLocation ImportLoc) {
   ModMap.resolveConflicts(M, /*Complain=*/false);
 
   // If this is the first time we've entered this module, set up its state.
-  auto R = Submodules.emplace(std::piecewise_construct, std::make_tuple(M),
-                              std::make_tuple());
+  auto R = Submodules.insert(std::make_pair(M, SubmoduleState()));
   auto &State = R.first->second;
   bool FirstTime = R.second;
   if (FirstTime) {