|
|
@@ -365,14 +365,14 @@ public:
|
|
|
_nUntracked = 0;
|
|
|
}
|
|
|
|
|
|
- virtual int ItemSize() const {
|
|
|
+ virtual int ItemSize() const override{
|
|
|
return ITEM_SIZE;
|
|
|
}
|
|
|
int CurrentAllocs() const {
|
|
|
return _currentAllocs;
|
|
|
}
|
|
|
|
|
|
- virtual void* Alloc() {
|
|
|
+ virtual void* Alloc() override{
|
|
|
if ( !_root ) {
|
|
|
// Need a new block.
|
|
|
Block* block = new Block();
|
|
|
@@ -398,7 +398,7 @@ public:
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- virtual void Free( void* mem ) {
|
|
|
+ virtual void Free( void* mem ) override {
|
|
|
if ( !mem ) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -416,7 +416,7 @@ public:
|
|
|
ITEM_SIZE, _nAllocs, _blockPtrs.Size() );
|
|
|
}
|
|
|
|
|
|
- void SetTracked() {
|
|
|
+ void SetTracked() override {
|
|
|
--_nUntracked;
|
|
|
}
|
|
|
|
|
|
@@ -992,12 +992,12 @@ class TINYXML2_LIB XMLText : public XMLNode
|
|
|
{
|
|
|
friend class XMLDocument;
|
|
|
public:
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
- virtual XMLText* ToText() {
|
|
|
+ virtual XMLText* ToText() override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLText* ToText() const {
|
|
|
+ virtual const XMLText* ToText() const override {
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
@@ -1010,14 +1010,14 @@ public:
|
|
|
return _isCData;
|
|
|
}
|
|
|
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* document ) const;
|
|
|
- virtual bool ShallowEqual( const XMLNode* compare ) const;
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
|
|
|
+ virtual bool ShallowEqual( const XMLNode* compare ) const override;
|
|
|
|
|
|
protected:
|
|
|
explicit XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {}
|
|
|
virtual ~XMLText() {}
|
|
|
|
|
|
- char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
|
|
|
+ char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
|
|
|
|
|
|
private:
|
|
|
bool _isCData;
|
|
|
@@ -1032,23 +1032,23 @@ class TINYXML2_LIB XMLComment : public XMLNode
|
|
|
{
|
|
|
friend class XMLDocument;
|
|
|
public:
|
|
|
- virtual XMLComment* ToComment() {
|
|
|
+ virtual XMLComment* ToComment() override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLComment* ToComment() const {
|
|
|
+ virtual const XMLComment* ToComment() const override {
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* document ) const;
|
|
|
- virtual bool ShallowEqual( const XMLNode* compare ) const;
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
|
|
|
+ virtual bool ShallowEqual( const XMLNode* compare ) const override;
|
|
|
|
|
|
protected:
|
|
|
explicit XMLComment( XMLDocument* doc );
|
|
|
virtual ~XMLComment();
|
|
|
|
|
|
- char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr);
|
|
|
+ char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr) override;
|
|
|
|
|
|
private:
|
|
|
XMLComment( const XMLComment& ); // not supported
|
|
|
@@ -1071,23 +1071,23 @@ class TINYXML2_LIB XMLDeclaration : public XMLNode
|
|
|
{
|
|
|
friend class XMLDocument;
|
|
|
public:
|
|
|
- virtual XMLDeclaration* ToDeclaration() {
|
|
|
+ virtual XMLDeclaration* ToDeclaration() override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLDeclaration* ToDeclaration() const {
|
|
|
+ virtual const XMLDeclaration* ToDeclaration() const override {
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* document ) const;
|
|
|
- virtual bool ShallowEqual( const XMLNode* compare ) const;
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
|
|
|
+ virtual bool ShallowEqual( const XMLNode* compare ) const override;
|
|
|
|
|
|
protected:
|
|
|
explicit XMLDeclaration( XMLDocument* doc );
|
|
|
virtual ~XMLDeclaration();
|
|
|
|
|
|
- char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
|
|
|
+ char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
|
|
|
|
|
|
private:
|
|
|
XMLDeclaration( const XMLDeclaration& ); // not supported
|
|
|
@@ -1106,23 +1106,23 @@ class TINYXML2_LIB XMLUnknown : public XMLNode
|
|
|
{
|
|
|
friend class XMLDocument;
|
|
|
public:
|
|
|
- virtual XMLUnknown* ToUnknown() {
|
|
|
+ virtual XMLUnknown* ToUnknown() override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLUnknown* ToUnknown() const {
|
|
|
+ virtual const XMLUnknown* ToUnknown() const override {
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* document ) const;
|
|
|
- virtual bool ShallowEqual( const XMLNode* compare ) const;
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
|
|
|
+ virtual bool ShallowEqual( const XMLNode* compare ) const override;
|
|
|
|
|
|
protected:
|
|
|
explicit XMLUnknown( XMLDocument* doc );
|
|
|
virtual ~XMLUnknown();
|
|
|
|
|
|
- char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
|
|
|
+ char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
|
|
|
|
|
|
private:
|
|
|
XMLUnknown( const XMLUnknown& ); // not supported
|
|
|
@@ -1274,13 +1274,13 @@ public:
|
|
|
SetValue( str, staticMem );
|
|
|
}
|
|
|
|
|
|
- virtual XMLElement* ToElement() {
|
|
|
+ virtual XMLElement* ToElement() override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLElement* ToElement() const {
|
|
|
+ virtual const XMLElement* ToElement() const override {
|
|
|
return this;
|
|
|
}
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
/** Given an attribute name, Attribute() returns the value
|
|
|
for the attribute of that name, or null if none
|
|
|
@@ -1676,11 +1676,11 @@ public:
|
|
|
ElementClosingType ClosingType() const {
|
|
|
return _closingType;
|
|
|
}
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* document ) const;
|
|
|
- virtual bool ShallowEqual( const XMLNode* compare ) const;
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
|
|
|
+ virtual bool ShallowEqual( const XMLNode* compare ) const override;
|
|
|
|
|
|
protected:
|
|
|
- char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
|
|
|
+ char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
|
|
|
|
|
|
private:
|
|
|
XMLElement( XMLDocument* doc );
|
|
|
@@ -1728,11 +1728,11 @@ public:
|
|
|
XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE );
|
|
|
~XMLDocument();
|
|
|
|
|
|
- virtual XMLDocument* ToDocument() {
|
|
|
+ virtual XMLDocument* ToDocument() override {
|
|
|
TIXMLASSERT( this == _document );
|
|
|
return this;
|
|
|
}
|
|
|
- virtual const XMLDocument* ToDocument() const {
|
|
|
+ virtual const XMLDocument* ToDocument() const override {
|
|
|
TIXMLASSERT( this == _document );
|
|
|
return this;
|
|
|
}
|
|
|
@@ -1829,7 +1829,7 @@ public:
|
|
|
@endverbatim
|
|
|
*/
|
|
|
void Print( XMLPrinter* streamer=0 ) const;
|
|
|
- virtual bool Accept( XMLVisitor* visitor ) const;
|
|
|
+ virtual bool Accept( XMLVisitor* visitor ) const override;
|
|
|
|
|
|
/**
|
|
|
Create a new Element associated with
|
|
|
@@ -1920,10 +1920,10 @@ public:
|
|
|
// internal
|
|
|
void MarkInUse(const XMLNode* const);
|
|
|
|
|
|
- virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const {
|
|
|
+ virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const override{
|
|
|
return 0;
|
|
|
}
|
|
|
- virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const {
|
|
|
+ virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const override{
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -2286,18 +2286,18 @@ public:
|
|
|
void PushDeclaration( const char* value );
|
|
|
void PushUnknown( const char* value );
|
|
|
|
|
|
- virtual bool VisitEnter( const XMLDocument& /*doc*/ );
|
|
|
- virtual bool VisitExit( const XMLDocument& /*doc*/ ) {
|
|
|
+ virtual bool VisitEnter( const XMLDocument& /*doc*/ ) override;
|
|
|
+ virtual bool VisitExit( const XMLDocument& /*doc*/ ) override {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute );
|
|
|
- virtual bool VisitExit( const XMLElement& element );
|
|
|
+ virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) override;
|
|
|
+ virtual bool VisitExit( const XMLElement& element ) override;
|
|
|
|
|
|
- virtual bool Visit( const XMLText& text );
|
|
|
- virtual bool Visit( const XMLComment& comment );
|
|
|
- virtual bool Visit( const XMLDeclaration& declaration );
|
|
|
- virtual bool Visit( const XMLUnknown& unknown );
|
|
|
+ virtual bool Visit( const XMLText& text ) override;
|
|
|
+ virtual bool Visit( const XMLComment& comment ) override;
|
|
|
+ virtual bool Visit( const XMLDeclaration& declaration ) override;
|
|
|
+ virtual bool Visit( const XMLUnknown& unknown ) override;
|
|
|
|
|
|
/**
|
|
|
If in print to memory mode, return a pointer to
|