diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-03-18 15:21:07 +0100 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-03-18 15:23:13 +0100 |
| commit | 61a504c4273d01aecf1a149f5d9d8a3ab5e354c3 (patch) | |
| tree | 4417d9e1e2f67acd3c56ec351055072e21cb6a27 /src/shared/cplusplus/Symbols.h | |
| parent | 1e2af0a77dcddd84de43879609733cd55302756f (diff) | |
Ensure that the memory pool can be reused after a rewind and get rid of the segmented array.
Diffstat (limited to 'src/shared/cplusplus/Symbols.h')
| -rw-r--r-- | src/shared/cplusplus/Symbols.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/shared/cplusplus/Symbols.h b/src/shared/cplusplus/Symbols.h index b5f4772737..039e3542e5 100644 --- a/src/shared/cplusplus/Symbols.h +++ b/src/shared/cplusplus/Symbols.h @@ -53,8 +53,7 @@ #include "Symbol.h" #include "Type.h" #include "FullySpecifiedType.h" -#include "Array.h" - +#include <vector> namespace CPlusPlus { @@ -511,7 +510,7 @@ protected: private: Key _key; TemplateParameters *_templateParameters; - Array<BaseClass *> _baseClasses; + std::vector<BaseClass *> _baseClasses; }; class CPLUSPLUS_EXPORT ObjCBaseClass: public Symbol @@ -593,7 +592,7 @@ public: virtual ~ObjCProtocol(); unsigned protocolCount() const - { return _protocols.count(); } + { return _protocols.size(); } ObjCBaseProtocol *protocolAt(unsigned index) const { return _protocols.at(index); } @@ -625,7 +624,7 @@ protected: virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; private: - Array<ObjCBaseProtocol *> _protocols; + std::vector<ObjCBaseProtocol *> _protocols; }; class CPLUSPLUS_EXPORT ObjCForwardClassDeclaration: public Symbol, public Type @@ -677,7 +676,7 @@ public: { _baseClass = baseClass; } unsigned protocolCount() const - { return _protocols.count(); } + { return _protocols.size(); } ObjCBaseProtocol *protocolAt(unsigned index) const { return _protocols.at(index); } @@ -712,7 +711,7 @@ private: bool _isInterface; const Name *_categoryName; ObjCBaseClass * _baseClass; - Array<ObjCBaseProtocol *> _protocols; + std::vector<ObjCBaseProtocol *> _protocols; }; class CPLUSPLUS_EXPORT ObjCMethod: public ScopedSymbol, public Type |