summaryrefslogtreecommitdiffstats
path: root/clang/lib/Serialization/ASTReader.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2014-11-19 07:49:47 +0000
committerDavid Blaikie <dblaikie@gmail.com>2014-11-19 07:49:47 +0000
commit82e95a3c79d670c5a702e87741de1659e694d17e (patch)
treeb13118ae48891173792e2ecf9e876e3cee769b7a /clang/lib/Serialization/ASTReader.cpp
parent70573dcd9f002307584b63033e6e017474e11b0c (diff)
downloadbcm5719-llvm-82e95a3c79d670c5a702e87741de1659e694d17e.tar.gz
bcm5719-llvm-82e95a3c79d670c5a702e87741de1659e694d17e.zip
Update for LLVM API change to make Small(Ptr)Set::insert return pair<iterator, bool> as per the C++ standard's associative container concept.
llvm-svn: 222335
Diffstat (limited to 'clang/lib/Serialization/ASTReader.cpp')
-rw-r--r--clang/lib/Serialization/ASTReader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 9c95a0cb268..1bbadfcee75 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -3525,7 +3525,7 @@ void ASTReader::makeModuleVisible(Module *Mod,
for (SmallVectorImpl<Module *>::iterator
I = Exports.begin(), E = Exports.end(); I != E; ++I) {
Module *Exported = *I;
- if (Visited.insert(Exported))
+ if (Visited.insert(Exported).second)
Stack.push_back(Exported);
}
@@ -8414,7 +8414,7 @@ void ASTReader::diagnoseOdrViolations() {
for (auto &Merge : OdrMergeFailures) {
// If we've already pointed out a specific problem with this class, don't
// bother issuing a general "something's different" diagnostic.
- if (!DiagnosedOdrMergeFailures.insert(Merge.first))
+ if (!DiagnosedOdrMergeFailures.insert(Merge.first).second)
continue;
bool Diagnosed = false;
OpenPOWER on IntegriCloud