From 72d4493fc21535f1f2720106e28ae3a6980851f5 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Wed, 11 Nov 2009 09:21:06 +0100
Subject: Added scope calculation for Objective-C classes.

---
 src/shared/cplusplus/CheckDeclaration.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/shared/cplusplus/CheckDeclaration.cpp')

diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index 0d1546234f..728e87385d 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -662,15 +662,13 @@ bool CheckDeclaration::visit(ObjCMethodDeclarationAST *ast)
         Declaration *decl = control()->newDeclaration(ast->firstToken(), methodType->name());
         decl->setType(methodType);
         symbol = decl;
+        symbol->setStorage(methodType->storage());
     }
 
     symbol->setStartOffset(tokenAt(ast->firstToken()).offset);
     symbol->setEndOffset(tokenAt(ast->lastToken()).offset);
     symbol->setVisibility(semantic()->currentVisibility());
 
-    if (semantic()->isObjCClassMethod(ast->method_prototype->method_type_token))
-        symbol->setStorage(Symbol::Static);
-
     _scope->enterSymbol(symbol);
 
     return false;
-- 
cgit v1.2.1