summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2012-04-03 20:26:45 +0000
committerNick Lewycky <nicholas@mxc.ca>2012-04-03 20:26:45 +0000
commit13668f2083baa01092b451bec85c77a92c032530 (patch)
tree62d3e7a5919045921d8eb3b146b2b3a87d809a47 /clang/lib/Sema
parent2a02fe1bb2046b59c3b2a820758b62ba4e146969 (diff)
downloadbcm5719-llvm-13668f2083baa01092b451bec85c77a92c032530.tar.gz
bcm5719-llvm-13668f2083baa01092b451bec85c77a92c032530.zip
Don't treat synthesized ivars as being in the base class for the purpose of
looking up visible decls. llvm-svn: 153967
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaLookup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index adbfedc6415..9fb248ed5bd 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -38,14 +38,14 @@
#include "llvm/ADT/TinyPtrVector.h"
#include "llvm/ADT/edit_distance.h"
#include "llvm/Support/ErrorHandling.h"
+#include <algorithm>
+#include <iterator>
#include <limits>
#include <list>
+#include <map>
#include <set>
-#include <vector>
-#include <iterator>
#include <utility>
-#include <algorithm>
-#include <map>
+#include <vector>
using namespace clang;
using namespace sema;
@@ -2984,7 +2984,7 @@ static void LookupVisibleDecls(DeclContext *Ctx, LookupResult &Result,
if (IFace->getImplementation()) {
ShadowContextRAII Shadow(Visited);
LookupVisibleDecls(IFace->getImplementation(), Result,
- QualifiedNameLookup, true, Consumer, Visited);
+ QualifiedNameLookup, InBaseClass, Consumer, Visited);
}
} else if (ObjCProtocolDecl *Protocol = dyn_cast<ObjCProtocolDecl>(Ctx)) {
for (ObjCProtocolDecl::protocol_iterator I = Protocol->protocol_begin(),
OpenPOWER on IntegriCloud