[geos-commits] [SCM] GEOS branch master updated. 85b2d372728d9cd82fe49fde3326fd0213f1fd14
git at osgeo.org
git at osgeo.org
Fri Feb 22 09:51:56 PST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via 85b2d372728d9cd82fe49fde3326fd0213f1fd14 (commit)
via 1a73099691f90ff96df7586591da8064016030d8 (commit)
via 901192ad737508f2bc8d2ecbe9a1ab898fa2b04e (commit)
via dfb8b30cc0f7fbcce8d15dc2fdb9a989781583f0 (commit)
via 09e3004d387c8e0416106be44b5be23f8b6a3745 (commit)
from ddc165a1ab9b0b9f527a014e4e4c06c3f6002f7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85b2d372728d9cd82fe49fde3326fd0213f1fd14
Merge: ddc165a 1a73099
Author: pramsey <pramsey at cleverelephant.ca>
Date: Fri Feb 22 09:51:56 2019 -0800
Merge branch 'warning_fixes' of rouault/geos into master
Hum, hum, mostly changes to 3rd party stuff, but we only change those once in a blue moon, so what the heck...
commit 1a73099691f90ff96df7586591da8064016030d8
Author: Even Rouault <even.rouault at spatialys.com>
Date: Thu Feb 21 18:18:21 2019 +0100
astyle: add missing override keyword
diff --git a/tools/astyle/astyle.h b/tools/astyle/astyle.h
index d886aa6..585ecc5 100755
--- a/tools/astyle/astyle.h
+++ b/tools/astyle/astyle.h
@@ -657,7 +657,7 @@ class ASFormatter : public ASBeautifier
public: // functions
ASFormatter();
virtual ~ASFormatter();
- virtual void init(ASSourceIterator* si);
+ virtual void init(ASSourceIterator* si) override;
virtual bool hasMoreLines() const;
virtual string nextLine();
LineEndFormat getLineEndFormat() const;
diff --git a/tools/astyle/astyle_main.h b/tools/astyle/astyle_main.h
index 32b2be1..0c9e7a9 100755
--- a/tools/astyle/astyle_main.h
+++ b/tools/astyle/astyle_main.h
@@ -130,12 +130,12 @@ public:
explicit ASStreamIterator(T* in);
virtual ~ASStreamIterator();
bool getLineEndChange(int lineEndFormat) const;
- int getStreamLength() const;
- string nextLine(bool emptyLineWasDeleted);
- string peekNextLine();
- void peekReset();
+ int getStreamLength() const override;
+ string nextLine(bool emptyLineWasDeleted) override;
+ string peekNextLine() override;
+ void peekReset() override;
void saveLastInputLine();
- streamoff tellg();
+ streamoff tellg() override;
private:
ASStreamIterator(const ASStreamIterator& copy); // copy constructor not to be implemented
@@ -155,8 +155,8 @@ public: // inline functions
bool compareToInputBuffer(const string& nextLine_) const
{ return (nextLine_ == prevBuffer); }
const string& getOutputEOL() const { return outputEOL; }
- streamoff getPeekStart() const { return peekStart; }
- bool hasMoreLines() const { return !inStream->eof(); }
+ streamoff getPeekStart() const override { return peekStart; }
+ bool hasMoreLines() const override { return !inStream->eof(); }
};
//----------------------------------------------------------------------------
commit 901192ad737508f2bc8d2ecbe9a1ab898fa2b04e
Author: Even Rouault <even.rouault at spatialys.com>
Date: Thu Feb 21 18:18:11 2019 +0100
tinyxml2: add missing override keyword
diff --git a/tests/xmltester/tinyxml2/tinyxml2.h b/tests/xmltester/tinyxml2/tinyxml2.h
index 5e3274f..aef7bef 100755
--- a/tests/xmltester/tinyxml2/tinyxml2.h
+++ b/tests/xmltester/tinyxml2/tinyxml2.h
@@ -362,14 +362,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();
@@ -395,7 +395,7 @@ public:
return result;
}
- virtual void Free( void* mem ) {
+ virtual void Free( void* mem ) override {
if ( !mem ) {
return;
}
@@ -413,7 +413,7 @@ public:
ITEM_SIZE, _nAllocs, _blockPtrs.Size() );
}
- void SetTracked() {
+ void SetTracked() override {
--_nUntracked;
}
@@ -983,12 +983,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;
}
@@ -1001,14 +1001,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;
@@ -1023,23 +1023,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
@@ -1062,23 +1062,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
@@ -1097,23 +1097,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
@@ -1255,13 +1255,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
@@ -1611,11 +1611,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 );
@@ -1663,11 +1663,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;
}
@@ -1764,7 +1764,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
@@ -1856,10 +1856,10 @@ public:
// internal
void MarkInUse(XMLNode*);
- 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;
}
@@ -2219,18 +2219,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
commit dfb8b30cc0f7fbcce8d15dc2fdb9a989781583f0
Author: Even Rouault <even.rouault at spatialys.com>
Date: Thu Feb 21 18:17:51 2019 +0100
Do not compile unused function getIndent()
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index bd7165f..085d1e6 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -132,6 +132,7 @@ java_math_round(double val)
} // java_math_round
+#ifdef not_used
// a utility function defining a very simple method to indent a line of text
const char*
getIndent(unsigned int numIndents)
@@ -145,7 +146,7 @@ getIndent(unsigned int numIndents)
return &pINDENT[ LENGTH - numIndents ];
}
-
+#endif
// void dump_to_stdout( const tinyxml2::XMLNode * pParent, unsigned int indent = 0 )
commit 09e3004d387c8e0416106be44b5be23f8b6a3745
Author: Even Rouault <even.rouault at spatialys.com>
Date: Thu Feb 21 18:17:14 2019 +0100
Densifier.h: add missing override keyword
diff --git a/include/geos/geom/util/Densifier.h b/include/geos/geom/util/Densifier.h
index 364b019..c577bc6 100644
--- a/include/geos/geom/util/Densifier.h
+++ b/include/geos/geom/util/Densifier.h
@@ -73,9 +73,9 @@ private:
public:
DensifyTransformer(double distanceTolerance);
double distanceTolerance;
- CoordinateSequence::Ptr transformCoordinates(const CoordinateSequence* coords, const Geometry* parent);
- Geometry::Ptr transformPolygon(const Polygon* geom, const Geometry* parent);
- Geometry::Ptr transformMultiPolygon(const MultiPolygon* geom, const Geometry* parent);
+ CoordinateSequence::Ptr transformCoordinates(const CoordinateSequence* coords, const Geometry* parent) override;
+ Geometry::Ptr transformPolygon(const Polygon* geom, const Geometry* parent) override;
+ Geometry::Ptr transformMultiPolygon(const MultiPolygon* geom, const Geometry* parent) override;
Geometry* createValidArea(const Geometry* roughAreaGeom);
};
-----------------------------------------------------------------------
Summary of changes:
include/geos/geom/util/Densifier.h | 6 +--
tests/xmltester/XMLTester.cpp | 3 +-
tests/xmltester/tinyxml2/tinyxml2.h | 94 ++++++++++++++++++-------------------
tools/astyle/astyle.h | 2 +-
tools/astyle/astyle_main.h | 14 +++---
5 files changed, 60 insertions(+), 59 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list