summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-06-08 10:13:17 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-06-08 10:13:17 +0000
commitd54186ac33c555538fc5c7e838c0f5e5d3931c3f (patch)
tree14670feafb3ec6e9d1679854dfda8801da5eb967 /clang/lib/Sema/SemaOverload.cpp
parent0169ec0988f9cc0d8a4c2ee05a79871e1ad4a598 (diff)
downloadbcm5719-llvm-d54186ac33c555538fc5c7e838c0f5e5d3931c3f.tar.gz
bcm5719-llvm-d54186ac33c555538fc5c7e838c0f5e5d3931c3f.zip
Fix a regression in the two-phase lookup diagnostics that switching the
namespace set algorithm (re-)introduced. We may not have seen the 'std' namespace, but we should still suggested associated namespaces. Easy fix, but a bit annoying to test. llvm-svn: 132744
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index dec49357fef..4bba6f8877b 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -7881,6 +7881,9 @@ DiagnoseTwoPhaseLookup(Sema &SemaRef, SourceLocation FnLoc,
if (!Std->Encloses(*it))
SuggestedNamespaces.insert(*it);
}
+ } else {
+ // Lacking the 'std::' namespace, use all of the associated namespaces.
+ SuggestedNamespaces = AssociatedNamespaces;
}
SemaRef.Diag(R.getNameLoc(), diag::err_not_found_by_two_phase_lookup)
OpenPOWER on IntegriCloud