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

Richard Smith richard-llvm at metafoo.co.uk
Wed May 20 18:26:53 PDT 2015


Author: rsmith
Date: Wed May 20 20:26:53 2015
New Revision: 237872

URL: http://llvm.org/viewvc/llvm-project?rev=237872&view=rev
Log:
Avoid using a C++11 library feature not present in libstdc++4.7.

Modified:
    cfe/trunk/lib/Lex/PPLexerChange.cpp

Modified: cfe/trunk/lib/Lex/PPLexerChange.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPLexerChange.cpp?rev=237872&r1=237871&r2=237872&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPLexerChange.cpp (original)
+++ cfe/trunk/lib/Lex/PPLexerChange.cpp Wed May 20 20:26:53 2015
@@ -627,8 +627,7 @@ void Preprocessor::EnterSubmodule(Module
   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) {





More information about the cfe-commits mailing list