diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-05-21 01:26:53 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-05-21 01:26:53 +0000 |
| commit | 2895be058a34f32bd85623c76d96790540ccd39a (patch) | |
| tree | d3de4f9c5e468c4fee0bf452d99a079a8470d16e /lib/Lex/PPLexerChange.cpp | |
| parent | e450a51e6598edd1a633100622a988f1576e7b16 (diff) | |
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
Diffstat (limited to 'lib/Lex/PPLexerChange.cpp')
| -rw-r--r-- | lib/Lex/PPLexerChange.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |