diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-13 10:20:00 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-13 14:57:04 +0200 |
| commit | c426b71334dd7e9f15bcfe8082cabc616d2f4b4a (patch) | |
| tree | 22d6b1495e1774c82f596f05f0ddf5e187c2c3ff /src/libs/3rdparty/cplusplus/Scope.cpp | |
| parent | 9fa9c227db52f4fac3ad70f973dec17d6e5308c5 (diff) | |
C++: Use soft asserts instead of assert()
Some qmake versions ignore "DEFINES += NDEBUG" on Windows.
Change-Id: Ibdf3b1036c2331dcef61dcd278463c02754044d2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Scope.cpp')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Scope.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/3rdparty/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp index 5dbc4ae183..66d422ad35 100644 --- a/src/libs/3rdparty/cplusplus/Scope.cpp +++ b/src/libs/3rdparty/cplusplus/Scope.cpp @@ -23,7 +23,9 @@ #include "Names.h" #include "Literals.h" #include "Templates.h" -#include <cassert> + +#include "cppassert.h" + #include <cstring> using namespace CPlusPlus; @@ -107,6 +109,8 @@ SymbolTable::~SymbolTable() void SymbolTable::enterSymbol(Symbol *symbol) { + CPP_ASSERT(! symbol->_scope || symbol->enclosingScope() == _owner, return); + if (++_symbolCount == _allocatedSymbols) { _allocatedSymbols <<= 1; if (! _allocatedSymbols) @@ -115,7 +119,6 @@ void SymbolTable::enterSymbol(Symbol *symbol) _symbols = reinterpret_cast<Symbol **>(realloc(_symbols, sizeof(Symbol *) * _allocatedSymbols)); } - assert(! symbol->_scope || symbol->enclosingScope() == _owner); symbol->_index = _symbolCount; symbol->_scope = _owner; _symbols[_symbolCount] = symbol; |