Merge remote-tracking branch 'origin/3.4'

2015-03-05 13:32:28 +01:00
parent 1e2d266541 4a1b6c1fd8
commit 2b954973d8
318 changed files with 1345 additions and 2178 deletions
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -1705,11 +1705,14 @@ bool CreateBindings::visit(Declaration *decl)

 bool CreateBindings::visit(Function *function)
 {
+    ClassOrNamespace *previous = _currentClassOrNamespace;
+    _currentClassOrNamespace = lookupType(function, previous);
    for (unsigned i = 0, count = function->memberCount(); i < count; ++i) {
        Symbol *s = function->memberAt(i);
        if (Block *b = s->asBlock())
            visit(b);
    }
+    _currentClassOrNamespace = previous;
    return false;
 }