]> granicus.if.org Git - clang/commitdiff
Avoid using a C++11 library feature not present in libstdc++4.7.
authorRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 21 May 2015 01:26:53 +0000 (01:26 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 21 May 2015 01:26:53 +0000 (01:26 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237872 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/PPLexerChange.cpp

index 027daae4bed18d92302421c0e993ddb91443a8d0..e68fb7df8e88a8ba84dd47d76714676c0c10161b 100644 (file)
@@ -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) {