aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus/Scope.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-07-08 15:28:07 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-07-16 08:26:19 +0200
commitf7e26babba3b645fd39a9b5691d513bc314d7759 (patch)
treec08743d151267bec14d119a7e642cc34b7fb2780 /src/libs/3rdparty/cplusplus/Scope.cpp
parent42e0e229afba2f9ccc01441346e0f53ae29c4feb (diff)
C++: Fix names of functions dealing with enclosing scopes
...in order to better tell apart the type related functions isScope()/asScope() and the functions dealing with enclosing scopes: * scope() --> enclosingScope() * setScope() --> setEnclosingScope() * resetScope() --> resetEnclosingScope() Change-Id: Id743a7d1b6a1a1a0ffcd8568cbd8ebbdfc16eaa1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Scope.cpp')
-rw-r--r--src/libs/3rdparty/cplusplus/Scope.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/3rdparty/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp
index 66d422ad35..ab1ba2710d 100644
--- a/src/libs/3rdparty/cplusplus/Scope.cpp
+++ b/src/libs/3rdparty/cplusplus/Scope.cpp
@@ -109,7 +109,7 @@ SymbolTable::~SymbolTable()
void SymbolTable::enterSymbol(Symbol *symbol)
{
- CPP_ASSERT(! symbol->_scope || symbol->enclosingScope() == _owner, return);
+ CPP_ASSERT(! symbol->_enclosingScope || symbol->enclosingScope() == _owner, return);
if (++_symbolCount == _allocatedSymbols) {
_allocatedSymbols <<= 1;
@@ -120,7 +120,7 @@ void SymbolTable::enterSymbol(Symbol *symbol)
}
symbol->_index = _symbolCount;
- symbol->_scope = _owner;
+ symbol->_enclosingScope = _owner;
_symbols[_symbolCount] = symbol;
if (_symbolCount * 5 >= _hashSize * 3)