summaryrefslogtreecommitdiff
path: root/shared/cplusplus
diff options
context:
space:
mode:
authordt <qtc-commiter@nokia.com>2008-12-05 14:30:48 +0100
committerdt <qtc-commiter@nokia.com>2008-12-05 14:30:48 +0100
commitf633d66c35506d0ad928647a7bf330d99bccbcae (patch)
treeec690026f4f69f222e7674b97762bdd4a35af695 /shared/cplusplus
parentd6e726ec68968c0bd64cc2d3350394afe808608a (diff)
parentecfb77d469e3410f06c093a7696fe8939f4f0632 (diff)
downloadqt-creator-f633d66c35506d0ad928647a7bf330d99bccbcae.tar.gz
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Diffstat (limited to 'shared/cplusplus')
-rw-r--r--shared/cplusplus/Scope.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/shared/cplusplus/Scope.cpp b/shared/cplusplus/Scope.cpp
index 2c1b986b2c..47221da121 100644
--- a/shared/cplusplus/Scope.cpp
+++ b/shared/cplusplus/Scope.cpp
@@ -292,6 +292,7 @@ Use *Scope::useAt(unsigned index) const
void Scope::addUse(unsigned sourceOffset, Name *name)
{
+#ifdef CPLUSPLUS_WITH_USES
if (++_useCount == _allocatedUses) {
_allocatedUses += 4;
_uses = reinterpret_cast<Use *>(realloc(_uses, _allocatedUses * sizeof(Use)));
@@ -303,6 +304,7 @@ void Scope::addUse(unsigned sourceOffset, Name *name)
else
lastVisibleSymbol = _symbols[_symbolCount];
_uses[_useCount].init(sourceOffset, name, lastVisibleSymbol);
+#endif
}
CPLUSPLUS_END_NAMESPACE