Apply clang-tidy-4.0 modernize-use-override

Used command:
  run-clang-tidy.py -header-filter='.*' -checks='-*,modernize-use-modernize' -fix

Part of GEOS RFC 5: C++11 Compilation Mode

capi/geos_ts_c.cpp

@@ -274,7 +274,7 @@ class CAPI_ItemVisitor : public geos::index::ItemVisitor {
   public:
     CAPI_ItemVisitor (GEOSQueryCallback cb, void *ud)
         : ItemVisitor(), callback(cb), userdata(ud) {}
-    void visitItem (void *item) { callback(item, userdata); }
+    void visitItem (void *item) override { callback(item, userdata); }
 };
 
 
@@ -6199,7 +6199,7 @@ GEOSSTRtree_nearest_generic_r(GEOSContextHandle_t extHandle,
 				GEOSDistanceCallback m_distancefn;
 				void* m_userdata;
 
-				double distance(const ItemBoundable* item1, const ItemBoundable* item2) {
+				double distance(const ItemBoundable* item1, const ItemBoundable* item2) override {
 						const void* a = item1->getItem();
 						const void* b = item2->getItem();
 						double d;

include/geos/algorithm/MCPointInRing.h

@@ -50,8 +50,8 @@ namespace algorithm { // geos::algorithm
 class GEOS_DLL MCPointInRing: public PointInRing {
 public:
 	MCPointInRing(const geom::LinearRing *newRing);
-	~MCPointInRing();
-	bool isInside(const geom::Coordinate& pt);
+	~MCPointInRing() override;
+	bool isInside(const geom::Coordinate& pt) override;
 
 	void testLineSegment(const geom::Coordinate& p,
 	                        const geom::LineSegment& seg);
@@ -63,7 +63,7 @@ public:
 		MCPointInRing *parent;
 	public:
 		MCSelecter(const geom::Coordinate& newP, MCPointInRing *prt);
-		void select(const geom::LineSegment& ls);
+		void select(const geom::LineSegment& ls) override;
 	};
 
 private:

include/geos/algorithm/NotRepresentableException.h

@@ -36,7 +36,7 @@ class GEOS_DLL NotRepresentableException: public util::GEOSException {
 public:
 	NotRepresentableException();
 	NotRepresentableException(std::string msg);
-	~NotRepresentableException() throw() {}
+	~NotRepresentableException() throw() override {}
 };
 
 } // namespace geos::algorithm

include/geos/algorithm/SIRtreePointInRing.h

@@ -49,8 +49,8 @@ private:
 			geom::LineSegment *seg);
 public:
 	SIRtreePointInRing(geom::LinearRing *newRing);
-	~SIRtreePointInRing();
-	bool isInside(const geom::Coordinate& pt);
+	~SIRtreePointInRing() override;
+	bool isInside(const geom::Coordinate& pt) override;
 };
 
 } // namespace geos::algorithm

include/geos/algorithm/SimplePointInRing.h

@@ -34,8 +34,8 @@ namespace algorithm { // geos::algorithm
 class GEOS_DLL SimplePointInRing: public PointInRing {
 public:
 	SimplePointInRing(geom::LinearRing *ring);
-	virtual ~SimplePointInRing();
-	bool isInside(const geom::Coordinate& pt);
+	~SimplePointInRing() override;
+	bool isInside(const geom::Coordinate& pt) override;
 private:
 	const geom::CoordinateSequence* pts;
 };

include/geos/algorithm/distance/DiscreteHausdorffDistance.h

@@ -160,7 +160,7 @@ public:
 			geom(geom)
 		{}
 
-		void filter_ro(const geom::Coordinate* pt)
+		void filter_ro(const geom::Coordinate* pt) override
 		{
 			minPtDist.initialize();
 			DistanceToPoint::computeDistance(geom, *pt,
@@ -198,11 +198,11 @@ public:
 		}
 
 		void filter_ro(const geom::CoordinateSequence& seq,
-		               std::size_t index);
+		               std::size_t index) override;
 
-		bool isGeometryChanged() const { return false; }
+		bool isGeometryChanged() const override { return false; }
 
-		bool isDone() const { return false; }
+		bool isDone() const override { return false; }
 
 		const PointPairDistance& getMaxPointDistance() const {
 			return maxPtDist;

include/geos/algorithm/locate/IndexedPointInAreaLocator.h

@@ -84,10 +84,10 @@ private:
 		:	counter( counter)
 		{ }
 
-		~SegmentVisitor()
+		~SegmentVisitor() override
 		{ }
 
-		void visitItem( void * item);
+		void visitItem( void * item) override;
 	};
 
 
@@ -107,7 +107,7 @@ public:
 	 */
 	IndexedPointInAreaLocator( const geom::Geometry & g);
 
-	~IndexedPointInAreaLocator();
+	~IndexedPointInAreaLocator() override;
 
 	/**
 	 * Determines the {@link Location} of a point in an areal {@link Geometry}.
@@ -115,7 +115,7 @@ public:
 	 * @param p the point to test
 	 * @return the location of the point in the geometry
 	 */
-	int locate( const geom::Coordinate * /*const*/ p);
+	int locate( const geom::Coordinate * /*const*/ p) override;
 
 };
 

include/geos/algorithm/locate/SimplePointInAreaLocator.h

@@ -59,7 +59,7 @@ public:
 	:	g( g)
 	{ }
 
-	int locate( const geom::Coordinate * p)
+	int locate( const geom::Coordinate * p) override
 	{
 		return locate( *p, g);
 	}

include/geos/geom/CoordinateArraySequence.h

@@ -41,22 +41,22 @@ public:
 
 	CoordinateArraySequence(const CoordinateSequence &cl);
 
-	CoordinateSequence *clone() const;
+	CoordinateSequence *clone() const override;
 
 	//const Coordinate& getCoordinate(int pos) const;
-	const Coordinate& getAt(std::size_t pos) const;
+	const Coordinate& getAt(std::size_t pos) const override;
 
 	/// Copy Coordinate at position i to Coordinate c
-	virtual void getAt(std::size_t i, Coordinate& c) const;
+	void getAt(std::size_t i, Coordinate& c) const override;
 
 	//int size() const;
-	size_t getSize() const;
+	size_t getSize() const override;
 
 	// @deprecated
-	const std::vector<Coordinate>* toVector() const;
+	const std::vector<Coordinate>* toVector() const override;
 
 	// See dox in CoordinateSequence.h
-	void toVector(std::vector<Coordinate>&) const;
+	void toVector(std::vector<Coordinate>&) const override;
 
 	/// Construct an empty sequence
 	CoordinateArraySequence();
@@ -68,18 +68,18 @@ public:
 	/// Construct sequence allocating space for n coordinates
 	CoordinateArraySequence(std::size_t n, std::size_t dimension = 0);
 
-	~CoordinateArraySequence();
+	~CoordinateArraySequence() override;
 
-	bool isEmpty() const { return empty(); }
+	bool isEmpty() const override { return empty(); }
 
 	bool empty() const { return vect->empty(); }
 
 	/// Reset this CoordinateArraySequence to the empty state
 	void clear() { vect->clear(); }
 
-	void add(const Coordinate& c);
+	void add(const Coordinate& c) override;
 
-	virtual void add(const Coordinate& c, bool allowRepeated);
+	void add(const Coordinate& c, bool allowRepeated) override;
 
 	/** \brief
 	 * Inserts the specified coordinate at the specified position in
@@ -92,31 +92,31 @@ public:
 	 *
 	 * NOTE: this is a CoordinateList interface in JTS
 	 */
-	virtual void add(std::size_t i, const Coordinate& coord, bool allowRepeated);
+	void add(std::size_t i, const Coordinate& coord, bool allowRepeated) override;
 
-	void setAt(const Coordinate& c, std::size_t pos);
+	void setAt(const Coordinate& c, std::size_t pos) override;
 
-	void deleteAt(std::size_t pos);
+	void deleteAt(std::size_t pos) override;
 
-	std::string toString() const;
+	std::string toString() const override;
 
-	void setPoints(const std::vector<Coordinate> &v);
+	void setPoints(const std::vector<Coordinate> &v) override;
 
 	double getOrdinate(std::size_t index,
-			size_t ordinateIndex) const;
+			size_t ordinateIndex) const override;
 
 	void setOrdinate(std::size_t index, std::size_t ordinateIndex,
-			double value);
+			double value) override;
 
-	void expandEnvelope(Envelope &env) const;
+	void expandEnvelope(Envelope &env) const override;
 
-    std::size_t getDimension() const;
+    std::size_t getDimension() const override;
 
-	void apply_rw(const CoordinateFilter *filter);
+	void apply_rw(const CoordinateFilter *filter) override;
 
-	void apply_ro(CoordinateFilter *filter) const;
+	void apply_ro(CoordinateFilter *filter) const override;
 
-	virtual CoordinateSequence& removeRepeatedPoints();
+	CoordinateSequence& removeRepeatedPoints() override;
 
 private:
 	std::vector<Coordinate> *vect;

include/geos/geom/CoordinateArraySequenceFactory.h

@@ -43,14 +43,14 @@ namespace geom { // geos::geom
 class GEOS_DLL CoordinateArraySequenceFactory: public CoordinateSequenceFactory {
 
 public:
-	CoordinateSequence *create() const;
+	CoordinateSequence *create() const override;
 
-	CoordinateSequence *create(std::vector<Coordinate> *coords, std::size_t dims=0) const;
+	CoordinateSequence *create(std::vector<Coordinate> *coords, std::size_t dims=0) const override;
 
    	/** @see CoordinateSequenceFactory::create(std::size_t, int) */
-	CoordinateSequence *create(std::size_t size, std::size_t dimension=0) const;
+	CoordinateSequence *create(std::size_t size, std::size_t dimension=0) const override;
 
-	CoordinateSequence *create(const CoordinateSequence &coordSeq) const;
+	CoordinateSequence *create(const CoordinateSequence &coordSeq) const override;
 
 	/** \brief
 	 * Returns the singleton instance of CoordinateArraySequenceFactory

include/geos/geom/Geometry.h

@@ -835,7 +835,7 @@ private:
 	class GEOS_DLL GeometryChangedFilter : public GeometryComponentFilter
 	{
 	public:
-		void filter_rw(Geometry* geom);
+		void filter_rw(Geometry* geom) override;
 	};
 
 	static GeometryChangedFilter geometryChangedFilter;

include/geos/geom/GeometryCollection.h

@@ -72,11 +72,11 @@ public:
 	 *
 	 * @return a clone of this instance
 	 */
-	virtual Geometry *clone() const {
+	Geometry *clone() const override {
 		return new GeometryCollection(*this);
 	}
 
-	virtual ~GeometryCollection();
+	~GeometryCollection() override;
 
 	/**
 	 * \brief
@@ -91,9 +91,9 @@ public:
 	 * @return the collected coordinates
 	 *
 	 */
-	virtual CoordinateSequence* getCoordinates() const;
+	CoordinateSequence* getCoordinates() const override;
 
-	virtual bool isEmpty() const;
+	bool isEmpty() const override;
 
 	/**
 	 * \brief
@@ -102,60 +102,60 @@ public:
 	 *
 	 * @see Dimension::DimensionType
 	 */
-	virtual Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/// Returns coordinate dimension.
-	virtual int getCoordinateDimension() const;
+	int getCoordinateDimension() const override;
 
-	virtual Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
 	/**
 	 * \brief
 	 * Returns the maximum boundary dimension of geometries in
 	 * this collection.
 	 */
-	virtual int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
-	virtual std::size_t getNumPoints() const;
+	std::size_t getNumPoints() const override;
 
-	virtual std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
-	virtual bool equalsExact(const Geometry *other,
-			double tolerance=0) const;
+	bool equalsExact(const Geometry *other,
+			double tolerance=0) const override;
 
-	virtual void apply_ro(CoordinateFilter *filter) const;
+	void apply_ro(CoordinateFilter *filter) const override;
 
-	virtual void apply_rw(const CoordinateFilter *filter);
+	void apply_rw(const CoordinateFilter *filter) override;
 
-	virtual void apply_ro(GeometryFilter *filter) const;
+	void apply_ro(GeometryFilter *filter) const override;
 
-	virtual void apply_rw(GeometryFilter *filter);
+	void apply_rw(GeometryFilter *filter) override;
 
-	virtual void apply_ro(GeometryComponentFilter *filter) const;
+	void apply_ro(GeometryComponentFilter *filter) const override;
 
-	virtual void apply_rw(GeometryComponentFilter *filter);
+	void apply_rw(GeometryComponentFilter *filter) override;
 
-	virtual void apply_rw(CoordinateSequenceFilter& filter);
+	void apply_rw(CoordinateSequenceFilter& filter) override;
 
-	virtual void apply_ro(CoordinateSequenceFilter& filter) const;
+	void apply_ro(CoordinateSequenceFilter& filter) const override;
 
-	virtual void normalize();
+	void normalize() override;
 
-	virtual const Coordinate* getCoordinate() const;
+	const Coordinate* getCoordinate() const override;
 
 	/// Returns the total area of this collection
-	virtual double getArea() const;
+	double getArea() const override;
 
 	/// Returns the total length of this collection
-	virtual double getLength() const;
+	double getLength() const override;
 
 	/// Returns the number of geometries in this collection
-	virtual std::size_t getNumGeometries() const;
+	std::size_t getNumGeometries() const override;
 
 	/// Returns a pointer to the nth Geometry int this collection
-	virtual const Geometry* getGeometryN(std::size_t n) const;
+	const Geometry* getGeometryN(std::size_t n) const override;
 
 protected:
 
@@ -190,9 +190,9 @@ protected:
 
 	std::vector<Geometry *>* geometries;
 
-	Envelope::Ptr computeEnvelopeInternal() const;
+	Envelope::Ptr computeEnvelopeInternal() const override;
 
-	int compareToSameClass(const Geometry *gc) const;
+	int compareToSameClass(const Geometry *gc) const override;
 
 };
 

include/geos/geom/LineString.h

@@ -76,7 +76,7 @@ public:
 	/// A vector of const LineString pointers
 	typedef std::vector<const LineString *> ConstVect;
 
-	virtual ~LineString();
+	~LineString() override;
 
 	/**
 	 * \brief
@@ -85,9 +85,9 @@ public:
 	 *
 	 * @return A clone of this instance
 	 */
-	virtual Geometry *clone() const;
+	Geometry *clone() const override;
 
-	virtual CoordinateSequence* getCoordinates() const;
+	CoordinateSequence* getCoordinates() const override;
 
 	/// Returns a read-only pointer to internal CoordinateSequence
 	const CoordinateSequence* getCoordinatesRO() const;
@@ -95,28 +95,28 @@ public:
 	virtual const Coordinate& getCoordinateN(int n) const;
 
 	/// Returns line dimension (1)
-	virtual Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/**
 	 * \brief
 	 * Returns Dimension::False for a closed LineString,
 	 * 0 otherwise (LineString boundary is a MultiPoint)
 	 */
-	virtual int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/// Returns coordinate dimension.
-	virtual int getCoordinateDimension() const;
+	int getCoordinateDimension() const override;
 
 	/**
 	 * \brief
 	 * Returns a MultiPoint.
 	 * Empty for closed LineString, a Point for each vertex otherwise.
 	 */
-	virtual Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
-	virtual bool isEmpty() const;
+	bool isEmpty() const override;
 
-	virtual std::size_t getNumPoints() const;
+	std::size_t getNumPoints() const override;
 
 	virtual Point* getPointN(std::size_t n) const;
 
@@ -136,30 +136,30 @@ public:
 
 	virtual bool isRing() const;
 
-	virtual std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
 	virtual bool isCoordinate(Coordinate& pt) const;
 
-	virtual bool equalsExact(const Geometry *other, double tolerance=0)
-		const;
+	bool equalsExact(const Geometry *other, double tolerance=0)
+		const override;
 
-	virtual void apply_rw(const CoordinateFilter *filter);
+	void apply_rw(const CoordinateFilter *filter) override;
 
-	virtual void apply_ro(CoordinateFilter *filter) const;
+	void apply_ro(CoordinateFilter *filter) const override;
 
-	virtual void apply_rw(GeometryFilter *filter);
+	void apply_rw(GeometryFilter *filter) override;
 
-	virtual void apply_ro(GeometryFilter *filter) const;
+	void apply_ro(GeometryFilter *filter) const override;
 
-	virtual void apply_rw(GeometryComponentFilter *filter);
+	void apply_rw(GeometryComponentFilter *filter) override;
 
-	virtual void apply_ro(GeometryComponentFilter *filter) const;
+	void apply_ro(GeometryComponentFilter *filter) const override;
 
-	void apply_rw(CoordinateSequenceFilter& filter);
+	void apply_rw(CoordinateSequenceFilter& filter) override;
 
-	void apply_ro(CoordinateSequenceFilter& filter) const;
+	void apply_ro(CoordinateSequenceFilter& filter) const override;
 
 	/** \brief
 	 * Normalizes a LineString.
@@ -168,14 +168,14 @@ public:
 	 * has the first point which is not equal to its reflected point
 	 * less than the reflected point.
 	 */
-	virtual void normalize();
+	void normalize() override;
 
 	//was protected
-	virtual int compareToSameClass(const Geometry *ls) const;
+	int compareToSameClass(const Geometry *ls) const override;
 
-	virtual const Coordinate* getCoordinate() const;
+	const Coordinate* getCoordinate() const override;
 
-	virtual double getLength() const;
+	double getLength() const override;
 
 	/**
 	 * Creates a LineString whose coordinates are in the reverse
@@ -198,7 +198,7 @@ protected:
 	LineString(CoordinateSequence::Ptr pts,
 			const GeometryFactory *newFactory);
 
-	Envelope::Ptr computeEnvelopeInternal() const;
+	Envelope::Ptr computeEnvelopeInternal() const override;
 
 	CoordinateSequence::Ptr points;
 

include/geos/geom/LinearRing.h

@@ -85,9 +85,9 @@ public:
 	LinearRing(CoordinateSequence::Ptr points,
 			const GeometryFactory *newFactory);
 
-	virtual Geometry *clone() const { return new LinearRing(*this); }
+	Geometry *clone() const override { return new LinearRing(*this); }
 
-	virtual ~LinearRing();
+	~LinearRing() override;
 
 	/** \brief
 	 * Returns <code>Dimension.FALSE</code>, since by definition
@@ -95,7 +95,7 @@ public:
 	 *
 	 * @return Dimension::False
 	 */
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/** \brief
 	 * Returns <code>true</code>, since by definition LinearRings
@@ -105,13 +105,13 @@ public:
 	 *
 	 * @see Geometry::isSimple
 	 */
-	bool isSimple() const;
+	bool isSimple() const override;
 
-	bool isClosed() const;
+	bool isClosed() const override;
 
-	std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
 	void setPoints(CoordinateSequence* cl);
 

include/geos/geom/MultiLineString.h

@@ -54,30 +54,30 @@ public:
 
 	friend class GeometryFactory;
 
-	virtual ~MultiLineString();
+	~MultiLineString() override;
 
 	/// Returns line dimension (1)
-	Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/**
 	 * \brief
 	 * Returns Dimension::False if all LineStrings in the collection
 	 * are closed, 0 otherwise.
 	 */
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/// Returns a (possibly empty) MultiPoint
-	Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
-	std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
 	bool isClosed() const;
 
-	bool equalsExact(const Geometry *other, double tolerance=0) const;
+	bool equalsExact(const Geometry *other, double tolerance=0) const override;
 
-	Geometry *clone() const;
+	Geometry *clone() const override;
 
 	/**
 	 * Creates a MultiLineString in the reverse

include/geos/geom/MultiPoint.h

@@ -59,13 +59,13 @@ public:
 
 	friend class GeometryFactory;
 
-	virtual ~MultiPoint();
+	~MultiPoint() override;
 
 	/// Returns point dimension (0)
-	Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/// Returns Dimension::False (Point has no boundary)
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/** \brief
 	 * Gets the boundary of this geometry.
@@ -76,15 +76,15 @@ public:
 	 * @return an empty GeometryCollection
 	 * @see Geometry#getBoundary
 	 */
-	Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
-	std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
-	bool equalsExact(const Geometry *other, double tolerance=0) const;
+	bool equalsExact(const Geometry *other, double tolerance=0) const override;
 
-	Geometry *clone() const { return new MultiPoint(*this); }
+	Geometry *clone() const override { return new MultiPoint(*this); }
 
 protected:
 

include/geos/geom/MultiPolygon.h

@@ -63,13 +63,13 @@ public:
 
 	friend class GeometryFactory;
 
-	virtual ~MultiPolygon();
+	~MultiPolygon() override;
 
 	/// Returns surface dimension (2)
-	Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/// Returns 1 (MultiPolygon boundary is MultiLineString)
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/** \brief
 	 * Computes the boundary of this geometry
@@ -77,17 +77,17 @@ public:
 	 * @return a lineal geometry (which may be empty)
 	 * @see Geometry#getBoundary
 	 */
-	Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
-	std::string getGeometryType() const;
+	std::string getGeometryType() const override;
 
-	virtual GeometryTypeId getGeometryTypeId() const;
+	GeometryTypeId getGeometryTypeId() const override;
 
-	bool isSimple() const;
+	bool isSimple() const override;
 
-	bool equalsExact(const Geometry *other, double tolerance=0) const;
+	bool equalsExact(const Geometry *other, double tolerance=0) const override;
 
-	Geometry *clone() const;
+	Geometry *clone() const override;
 
 protected:
 

include/geos/geom/Point.h

@@ -74,7 +74,7 @@ public:
 	/// A vector of const Point pointers
 	typedef std::vector<const Point *> ConstVect;
 
-	virtual ~Point();
+	~Point() override;
 
 	/**
 	 * Creates and returns a full copy of this {@link Point} object.
@@ -82,24 +82,24 @@ public:
 	 *
 	 * @return a clone of this instance
 	 */
-	Geometry *clone() const { return new Point(*this); }
+	Geometry *clone() const override { return new Point(*this); }
 
-	CoordinateSequence* getCoordinates(void) const;
+	CoordinateSequence* getCoordinates(void) const override;
 
 	const CoordinateSequence* getCoordinatesRO() const;
 
-	size_t getNumPoints() const;
-	bool isEmpty() const;
-	bool isSimple() const;
+	size_t getNumPoints() const override;
+	bool isEmpty() const override;
+	bool isSimple() const override;
 
 	/// Returns point dimension (0)
-	Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/// Returns coordinate dimension.
-	virtual int getCoordinateDimension() const;
+	int getCoordinateDimension() const override;
 
 	/// Returns Dimension::False (Point has no boundary)
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/**
 	 * Gets the boundary of this geometry.
@@ -109,25 +109,25 @@ public:
 	 * @return an empty GeometryCollection
 	 * @see Geometry::getBoundary
 	 */
-	Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
 	double getX() const;
 	double getY() const;
-	const Coordinate* getCoordinate() const;
-	std::string getGeometryType() const;
-	virtual GeometryTypeId getGeometryTypeId() const;
-	void apply_ro(CoordinateFilter *filter) const;
-	void apply_rw(const CoordinateFilter *filter);
-	void apply_ro(GeometryFilter *filter) const;
-	void apply_rw(GeometryFilter *filter);
-	void apply_rw(GeometryComponentFilter *filter);
-	void apply_ro(GeometryComponentFilter *filter) const;
-	void apply_rw(CoordinateSequenceFilter& filter);
-	void apply_ro(CoordinateSequenceFilter& filter) const;
+	const Coordinate* getCoordinate() const override;
+	std::string getGeometryType() const override;
+	GeometryTypeId getGeometryTypeId() const override;
+	void apply_ro(CoordinateFilter *filter) const override;
+	void apply_rw(const CoordinateFilter *filter) override;
+	void apply_ro(GeometryFilter *filter) const override;
+	void apply_rw(GeometryFilter *filter) override;
+	void apply_rw(GeometryComponentFilter *filter) override;
+	void apply_ro(GeometryComponentFilter *filter) const override;
+	void apply_rw(CoordinateSequenceFilter& filter) override;
+	void apply_ro(CoordinateSequenceFilter& filter) const override;
 
-	bool equalsExact(const Geometry *other, double tolerance=0) const;
+	bool equalsExact(const Geometry *other, double tolerance=0) const override;
 
-	void normalize(void)
+	void normalize(void) override
 	{
 		// a Point is always in normalized form
 	}
@@ -155,9 +155,9 @@ protected:
 
 	Point(const Point &p);
 
-	Envelope::Ptr computeEnvelopeInternal() const;
+	Envelope::Ptr computeEnvelopeInternal() const override;
 
-	int compareToSameClass(const Geometry *p) const;
+	int compareToSameClass(const Geometry *p) const override;
 
 private:
 

include/geos/geom/Polygon.h

@@ -73,7 +73,7 @@ public:
 	/// A vector of const Polygon pointers
 	typedef std::vector<const Polygon *> ConstVect;
 
-	virtual ~Polygon();
+	~Polygon() override;
 
 	/**
 	 * Creates and returns a full copy of this {@link Polygon} object.
@@ -81,20 +81,20 @@ public:
 	 *
 	 * @return a clone of this instance
 	 */
-	virtual Geometry *clone() const { return new Polygon(*this); }
+	Geometry *clone() const override { return new Polygon(*this); }
 
-	CoordinateSequence* getCoordinates() const;
+	CoordinateSequence* getCoordinates() const override;
 
-	size_t getNumPoints() const;
+	size_t getNumPoints() const override;
 
 	/// Returns surface dimension (2)
-	Dimension::DimensionType getDimension() const;
+	Dimension::DimensionType getDimension() const override;
 
 	/// Returns coordinate dimension.
-	virtual int getCoordinateDimension() const;
+	int getCoordinateDimension() const override;
 
 	/// Returns 1 (Polygon boundary is a MultiLineString)
-	int getBoundaryDimension() const;
+	int getBoundaryDimension() const override;
 
 	/** \brief
 	 * Computes the boundary of this geometry
@@ -102,9 +102,9 @@ public:
 	 * @return a lineal geometry (which may be empty)
 	 * @see Geometry#getBoundary
 	 */
-	Geometry* getBoundary() const;
+	Geometry* getBoundary() const override;
 
-	bool isEmpty() const;
+	bool isEmpty() const override;
 
 	/** \brief
 	 * Tests if a valid polygon is simple.
@@ -112,7 +112,7 @@ public:
 	 *
 	 * @return <code>true</code>
 	 */
-	bool isSimple() const;
+	bool isSimple() const override;
 
 	/// Returns the exterior ring (shell)
 	const LineString* getExteriorRing() const;
@@ -123,34 +123,34 @@ public:
 	/// Get nth interior ring (hole)
 	const LineString* getInteriorRingN(std::size_t n) const;
 
-	std::string getGeometryType() const;
-	virtual GeometryTypeId getGeometryTypeId() const;
-	bool equalsExact(const Geometry *other, double tolerance=0) const;
-	void apply_rw(const CoordinateFilter *filter);
-	void apply_ro(CoordinateFilter *filter) const;
-	void apply_rw(GeometryFilter *filter);
-	void apply_ro(GeometryFilter *filter) const;
-	void apply_rw(CoordinateSequenceFilter& filter);
-	void apply_ro(CoordinateSequenceFilter& filter) const;
+	std::string getGeometryType() const override;
+	GeometryTypeId getGeometryTypeId() const override;
+	bool equalsExact(const Geometry *other, double tolerance=0) const override;
+	void apply_rw(const CoordinateFilter *filter) override;
+	void apply_ro(CoordinateFilter *filter) const override;
+	void apply_rw(GeometryFilter *filter) override;
+	void apply_ro(GeometryFilter *filter) const override;
+	void apply_rw(CoordinateSequenceFilter& filter) override;
+	void apply_ro(CoordinateSequenceFilter& filter) const override;
 
-	Geometry* convexHull() const;
+	Geometry* convexHull() const override;
 
-	void normalize();
+	void normalize() override;
 
-	int compareToSameClass(const Geometry *p) const; //was protected
+	int compareToSameClass(const Geometry *p) const override; //was protected
 
-	const Coordinate* getCoordinate() const;
+	const Coordinate* getCoordinate() const override;
 
-	double getArea() const;
+	double getArea() const override;
 
  	/// Returns the perimeter of this <code>Polygon</code>
-	double getLength() const;
+	double getLength() const override;
 
-	void apply_rw(GeometryComponentFilter *filter);
+	void apply_rw(GeometryComponentFilter *filter) override;
 
-	void apply_ro(GeometryComponentFilter *filter) const;
+	void apply_ro(GeometryComponentFilter *filter) const override;
 
-	bool isRectangle() const;
+	bool isRectangle() const override;
 
 protected:
 
@@ -182,7 +182,7 @@ protected:
 
 	std::vector<Geometry *> *holes; //Actually vector<LinearRing *>
 
-	Envelope::Ptr computeEnvelopeInternal() const;
+	Envelope::Ptr computeEnvelopeInternal() const override;
 
 private:
 

include/geos/geom/prep/AbstractPreparedPolygonContains.h

@@ -125,7 +125,7 @@ public:
 		requireSomePointInInterior(requireSomePointInInterior)
 	{ }
 
-	virtual ~AbstractPreparedPolygonContains()
+	~AbstractPreparedPolygonContains() override
 	{ }
 
 };

include/geos/geom/prep/BasicPreparedGeometry.h

@@ -90,9 +90,9 @@ protected:
 public:
 	BasicPreparedGeometry( const Geometry * geom);
 
-	~BasicPreparedGeometry( );
+	~BasicPreparedGeometry( ) override;
 
-	const geom::Geometry & getGeometry() const
+	const geom::Geometry & getGeometry() const override
 	{
 		return *baseGeom;
 	}
@@ -123,53 +123,53 @@ public:
 	/**
 	 * Default implementation.
 	 */
-	bool contains(const geom::Geometry * g) const;
+	bool contains(const geom::Geometry * g) const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool containsProperly(const geom::Geometry * g)	const;
+	bool containsProperly(const geom::Geometry * g)	const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool coveredBy(const geom::Geometry * g) const;
+	bool coveredBy(const geom::Geometry * g) const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool covers(const geom::Geometry * g) const;
+	bool covers(const geom::Geometry * g) const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool crosses(const geom::Geometry * g) const;
+	bool crosses(const geom::Geometry * g) const override;
 
 	/**
 	 * Standard implementation for all geometries.
 	 * Supports {@link GeometryCollection}s as input.
 	 */
-	bool disjoint(const geom::Geometry * g)	const;
+	bool disjoint(const geom::Geometry * g)	const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool intersects(const geom::Geometry * g) const;
+	bool intersects(const geom::Geometry * g) const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool overlaps(const geom::Geometry * g)	const;
+	bool overlaps(const geom::Geometry * g)	const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool touches(const geom::Geometry * g) const;
+	bool touches(const geom::Geometry * g) const override;
 
 	/**
 	 * Default implementation.
 	 */
-	bool within(const geom::Geometry * g) const;
+	bool within(const geom::Geometry * g) const override;
 
 	std::string toString();
 

include/geos/geom/prep/PreparedLineString.h

@@ -54,11 +54,11 @@ public:
 		segIntFinder( nullptr)
 	{ }
 
-	~PreparedLineString();
+	~PreparedLineString() override;
 
 	noding::FastSegmentSetIntersectionFinder * getIntersectionFinder();
 
-	bool intersects(const geom::Geometry * g) const;
+	bool intersects(const geom::Geometry * g) const override;
 
 };
 

include/geos/geom/prep/PreparedPoint.h

@@ -48,7 +48,7 @@ public:
 	 * The optimization here is that computing topology for the test
 	 * geometry is avoided. This can be significant for large geometries.
 	 */
-	bool intersects(const geom::Geometry* g) const;
+	bool intersects(const geom::Geometry* g) const override;
 
 };
 

include/geos/geom/prep/PreparedPolygon.h

@@ -56,15 +56,15 @@ private:
 protected:
 public:
 	PreparedPolygon( const geom::Geometry * geom);
-	~PreparedPolygon( );
+	~PreparedPolygon( ) override;
 
 	noding::FastSegmentSetIntersectionFinder * getIntersectionFinder() const;
 	algorithm::locate::PointOnGeometryLocator * getPointLocator() const;
 
-	bool contains( const geom::Geometry* g) const;
-	bool containsProperly( const geom::Geometry* g) const;
-	bool covers( const geom::Geometry* g) const;
-	bool intersects( const geom::Geometry* g) const;
+	bool contains( const geom::Geometry* g) const override;
+	bool containsProperly( const geom::Geometry* g) const override;
+	bool covers( const geom::Geometry* g) const override;
+	bool intersects( const geom::Geometry* g) const override;
 
 };
 

include/geos/geom/prep/PreparedPolygonContains.h

@@ -95,7 +95,7 @@ protected:
 	* @param geom the test geometry
 	* @return true if this prepared polygon contains the test geometry
 	*/
-	bool fullTopologicalPredicate(const geom::Geometry * geom);
+	bool fullTopologicalPredicate(const geom::Geometry * geom) override;
 
 };
 

include/geos/geom/prep/PreparedPolygonCovers.h

@@ -63,7 +63,7 @@ protected:
 	 * @param geom the test geometry
 	 * @return true if this prepared polygon covers the test geometry
 	 */
-	bool fullTopologicalPredicate( const geom::Geometry * geom);
+	bool fullTopologicalPredicate( const geom::Geometry * geom) override;
 
 public:
 	/**

include/geos/geom/util/ComponentCoordinateExtracter.h

@@ -53,9 +53,9 @@ public:
 	 */
 	ComponentCoordinateExtracter( std::vector<const Coordinate*> &newComps);
 
-	void filter_rw( Geometry * geom);
+	void filter_rw( Geometry * geom) override;
 
-	void filter_ro( const Geometry * geom);
+	void filter_ro( const Geometry * geom) override;
 
 private:
 

include/geos/geom/util/CoordinateOperation.h

@@ -45,8 +45,8 @@ public:
 	/**
 	 * Return a newly created geometry, ownership to caller
 	 */
-	virtual Geometry* edit(const Geometry *geometry,
-			const GeometryFactory *factory);
+	Geometry* edit(const Geometry *geometry,
+			const GeometryFactory *factory) override;
 
 	/**
 	 * Edits the array of Coordinate from a Geometry.
@@ -60,7 +60,7 @@ public:
 			const Geometry *geometry)=0;
 
 
-	virtual ~CoordinateOperation() {}
+	~CoordinateOperation() override {}
 };
 
 

include/geos/geom/util/GeometryExtracter.h

@@ -74,7 +74,7 @@ private:
 
     TargetContainer& comps_;
 
-    void filter_ro(const Geometry* geom)
+    void filter_ro(const Geometry* geom) override
     {
       if ( const ComponentType* c = dynamic_cast<const ComponentType*>(geom) ) {
         comps_.push_back(c);

include/geos/geom/util/LinearComponentExtracter.h

@@ -57,9 +57,9 @@ public:
 	 */
 	LinearComponentExtracter(std::vector<const LineString*> &newComps);
 
-	void filter_rw(Geometry *geom);
+	void filter_rw(Geometry *geom) override;
 
-	void filter_ro(const Geometry *geom);
+	void filter_ro(const Geometry *geom) override;
 
 };
 

include/geos/geom/util/PointExtracter.h

@@ -46,9 +46,9 @@ public:
 	 */
 	PointExtracter(Point::ConstVect& newComps);
 
-	void filter_rw(Geometry *geom);
+	void filter_rw(Geometry *geom) override;
 
-	void filter_ro(const Geometry *geom);
+	void filter_ro(const Geometry *geom) override;
 
 private:
 

include/geos/geom/util/PolygonExtracter.h

@@ -48,9 +48,9 @@ public:
 	 */
 	PolygonExtracter(std::vector<const Polygon*>& newComps);
 
-	void filter_rw(Geometry *geom);
+	void filter_rw(Geometry *geom) override;
 
-	void filter_ro(const Geometry *geom);
+	void filter_ro(const Geometry *geom) override;
 
 private:
 

include/geos/geomgraph/DirectedEdge.h

@@ -142,7 +142,7 @@ public:
 	 */
 	void setEdgeDepths(int position, int newDepth);
 
-	virtual std::string print() const;
+	std::string print() const override;
 
 	std::string printEdge();
 

include/geos/geomgraph/DirectedEdgeStar.h

@@ -63,12 +63,12 @@ public:
 		label()
 	{}
 
-	~DirectedEdgeStar() {
+	~DirectedEdgeStar() override {
 		delete resultAreaEdgeList;
 	}
 
 	/// Insert a directed edge in the list
-	void insert(EdgeEnd *ee);
+	void insert(EdgeEnd *ee) override;
 
 	Label &getLabel() { return label; }
 
@@ -82,7 +82,7 @@ public:
 	 * Compute the labelling for all dirEdges in this star, as well
 	 * as the overall labelling
 	 */
-	void computeLabelling(std::vector<GeometryGraph*> *geom); // throw(TopologyException *);
+	void computeLabelling(std::vector<GeometryGraph*> *geom) override; // throw(TopologyException *);
 
 	/** \brief
 	 * For each dirEdge in the star,
@@ -132,7 +132,7 @@ public:
 	 */
 	void computeDepths(DirectedEdge *de);
 
-	virtual std::string print() const;
+	std::string print() const override;
 
 private:
 

include/geos/geomgraph/Edge.h

@@ -107,7 +107,7 @@ public:
 	/// Takes ownership of CoordinateSequence
 	Edge(geom::CoordinateSequence* newPts);
 
-	virtual ~Edge();
+	~Edge() override;
 
 	virtual int getNumPoints() const {
 		return static_cast<int>(pts->getSize());
@@ -187,7 +187,7 @@ public:
 		testInvariant();
 	}
 
-	virtual bool isIsolated() const {
+	bool isIsolated() const override {
 		testInvariant();
 		return isIsolatedVar;
 	}
@@ -212,7 +212,7 @@ public:
 	/// A component only contributes if it has a labelling for both
 	/// parent geometries
 	///
-	virtual void computeIM(geom::IntersectionMatrix& im) {
+	void computeIM(geom::IntersectionMatrix& im) override {
 		updateIM(label, im);
 		testInvariant();
 	}

include/geos/geomgraph/GeometryGraph.h

@@ -175,7 +175,7 @@ public:
 	GeometryGraph(int newArgIndex, const geom::Geometry *newParentGeom,
 	              const algorithm::BoundaryNodeRule& boundaryNodeRule);
 
-	virtual ~GeometryGraph();
+	~GeometryGraph() override;
 
 
 	const geom::Geometry* getGeometry();

include/geos/geomgraph/Node.h

@@ -68,13 +68,13 @@ public:
 
 	Node(const geom::Coordinate& newCoord, EdgeEndStar* newEdges);
 
-	virtual ~Node();
+	~Node() override;
 
 	virtual const geom::Coordinate& getCoordinate() const;
 
 	virtual EdgeEndStar* getEdges();
 
-	virtual bool isIsolated() const;
+	bool isIsolated() const override;
 
 	/** \brief
 	 * Add the edge to the list of edges at this node
@@ -140,7 +140,7 @@ protected:
 	/** \brief
 	 * Basic nodes do not compute IMs
 	 */
-	virtual void computeIM(geom::IntersectionMatrix& /*im*/) {}
+	void computeIM(geom::IntersectionMatrix& /*im*/) override {}
 
 private:
 

include/geos/geomgraph/index/MonotoneChain.h

@@ -53,7 +53,7 @@ public:
 		chainIndex(newChainIndex)
 	{}
 
-	~MonotoneChain() {}
+	~MonotoneChain() override {}
 
 	void computeIntersections(MonotoneChain *mc,SegmentIntersector *si) {
 		mce->computeIntersectsForChain(chainIndex,*(mc->mce),mc->chainIndex,*si);

include/geos/geomgraph/index/SimpleEdgeSetIntersector.h

@@ -42,10 +42,10 @@ public:
 	SimpleEdgeSetIntersector();
 
 	void computeIntersections(std::vector<Edge*> *edges,
-			SegmentIntersector *si, bool testAllSegments);
+			SegmentIntersector *si, bool testAllSegments) override;
 
 	void computeIntersections(std::vector<Edge*> *edges0,
-			std::vector<Edge*> *edges1, SegmentIntersector *si);
+			std::vector<Edge*> *edges1, SegmentIntersector *si) override;
 
 private:
 

include/geos/geomgraph/index/SimpleMCSweepLineIntersector.h

@@ -57,14 +57,14 @@ public:
 
 	SimpleMCSweepLineIntersector();
 
-	virtual ~SimpleMCSweepLineIntersector();
+	~SimpleMCSweepLineIntersector() override;
 
 	void computeIntersections(std::vector<Edge*> *edges,
-			SegmentIntersector *si, bool testAllSegments);
+			SegmentIntersector *si, bool testAllSegments) override;
 
 	void computeIntersections(std::vector<Edge*> *edges0,
 			std::vector<Edge*> *edges1,
-			SegmentIntersector *si);
+			SegmentIntersector *si) override;
 
 protected:
 

include/geos/geomgraph/index/SimpleSweepLineIntersector.h

@@ -54,15 +54,15 @@ public:
 
 	SimpleSweepLineIntersector();
 
-	virtual ~SimpleSweepLineIntersector();
+	~SimpleSweepLineIntersector() override;
 
 	void computeIntersections(std::vector<Edge*> *edges,
 			SegmentIntersector *si,
-			bool testAllSegments);
+			bool testAllSegments) override;
 
 	void computeIntersections(std::vector<Edge*> *edges0,
 			std::vector<Edge*> *edges1,
-			SegmentIntersector *si);
+			SegmentIntersector *si) override;
 
 private:
 

include/geos/geomgraph/index/SweepLineSegment.h

@@ -40,7 +40,7 @@ namespace index { // geos::geomgraph::index
 class GEOS_DLL SweepLineSegment: public SweepLineEventOBJ {
 public:
 	SweepLineSegment(Edge *newEdge, int newPtIndex);
-	~SweepLineSegment();
+	~SweepLineSegment() override;
 	double getMinX();
 	double getMaxX();
 	void computeIntersections(SweepLineSegment *ss, SegmentIntersector *si);

include/geos/index/bintree/Node.h

@@ -42,7 +42,7 @@ public:
 
 	Node(Interval *newInterval,int newLevel);
 
-	~Node();
+	~Node() override;
 
 	Interval* getInterval();
 
@@ -66,7 +66,7 @@ private:
 
 protected:
 
-	bool isSearchMatch(Interval *itemInterval);
+	bool isSearchMatch(Interval *itemInterval) override;
 };
 
 } // namespace geos::index::bintree

include/geos/index/bintree/Root.h

@@ -53,7 +53,7 @@ public:
 
 	Root() {}
 
-	~Root() {}
+	~Root() override {}
 
 	/// @param itemInterval
 	///     Ownership left to caller, references kept in this class.
@@ -65,7 +65,7 @@ public:
 
 protected:
 
-	bool isSearchMatch(Interval* /*interval*/) { return true; }
+	bool isSearchMatch(Interval* /*interval*/) override { return true; }
 };
 
 } // namespace geos::index::bintree

include/geos/index/intervalrtree/IntervalRTreeBranchNode.h

@@ -52,14 +52,14 @@ public:
 		node2( n2)
 	{ }
 
-	~IntervalRTreeBranchNode()
+	~IntervalRTreeBranchNode() override
 	{
 		delete node1;
 		delete node2;
 	}
 
 
-	void query(double queryMin, double queryMax, index::ItemVisitor * visitor) const;
+	void query(double queryMin, double queryMax, index::ItemVisitor * visitor) const override;
 };
 
 } // geos::intervalrtree

include/geos/index/intervalrtree/IntervalRTreeLeafNode.h

@@ -47,11 +47,11 @@ public:
 		item( item)
 	{ }
 
-	~IntervalRTreeLeafNode()
+	~IntervalRTreeLeafNode() override
 	{
 	}
 
-	void query( double queryMin, double queryMax, index::ItemVisitor * visitor) const;
+	void query( double queryMin, double queryMax, index::ItemVisitor * visitor) const override;
 
 };
 

include/geos/index/quadtree/Node.h

@@ -75,7 +75,7 @@ private:
 
 protected:
 
-	bool isSearchMatch(const geom::Envelope& searchEnv) const {
+	bool isSearchMatch(const geom::Envelope& searchEnv) const override {
 		return env->intersects(searchEnv);
 	}
 
@@ -101,7 +101,7 @@ public:
 	{
 	}
 
-	virtual ~Node() {}
+	~Node() override {}
 
 	/// Return Envelope associated with this node
 	/// ownership retained by this object
@@ -122,7 +122,7 @@ public:
 
 	void insertNode(std::unique_ptr<Node> node);
 
-	std::string toString() const;
+	std::string toString() const override;
 
 };
 

include/geos/index/quadtree/Quadtree.h

@@ -113,7 +113,7 @@ public:
 		minExtent(1.0)
 	{}
 
-	~Quadtree();
+	~Quadtree() override;
 
 	/// Returns the number of levels in the tree.
 	int depth();
@@ -121,7 +121,7 @@ public:
 	/// Returns the number of items in the tree.
 	int size();
 
-	void insert(const geom::Envelope *itemEnv, void *item);
+	void insert(const geom::Envelope *itemEnv, void *item) override;
 
 	/** \brief
 	 * Queries the tree and returns items which may lie
@@ -140,7 +140,7 @@ public:
 	 * @param ret a vector where items which may intersect the
 	 * 	      search envelope are pushed
 	 */
-	void query(const geom::Envelope *searchEnv, std::vector<void*>& ret);
+	void query(const geom::Envelope *searchEnv, std::vector<void*>& ret) override;
 
 
 	/** \brief
@@ -159,7 +159,7 @@ public:
 	 * @param searchEnv the envelope of the desired query area.
 	 * @param visitor a visitor object which is passed the visited items
 	 */
-	void query(const geom::Envelope *searchEnv, ItemVisitor& visitor)
+	void query(const geom::Envelope *searchEnv, ItemVisitor& visitor) override
 	{
 		/*
 		 * the items that are matched are the items in quads which
@@ -175,7 +175,7 @@ public:
 	 * @param item the item to remove
 	 * @return <code>true</code> if the item was found (and thus removed)
 	 */
-	bool remove(const geom::Envelope* itemEnv, void* item);
+	bool remove(const geom::Envelope* itemEnv, void* item) override;
 
 	/// Return a list of all items in the Quadtree
 	std::vector<void*>* queryAll();

include/geos/index/quadtree/Root.h

@@ -65,7 +65,7 @@ public:
 
 	Root() {}
 
-	virtual ~Root() {}
+	~Root() override {}
 
 	/**
 	 * Insert an item into the quadtree this is the root of.
@@ -74,7 +74,7 @@ public:
 
 protected:
 
-	bool isSearchMatch(const geom::Envelope& /* searchEnv */) const {
+	bool isSearchMatch(const geom::Envelope& /* searchEnv */) const override {
 		return true;
 	}
 

include/geos/index/strtree/AbstractNode.h

@@ -45,7 +45,7 @@ private:
 	int level;
 public:
 	AbstractNode(int newLevel, int capacity=10);
-	virtual	~AbstractNode();
+		~AbstractNode() override;
 
 	// TODO: change signature to return by ref,
 	// document ownership of the return
@@ -71,7 +71,7 @@ public:
 	 *
 	 * @see AbstractSTRtree::IntersectsOp
 	 */
-	const void* getBounds() const;
+	const void* getBounds() const override;
 
 	int getLevel();
 

include/geos/index/strtree/GeometryItemDistance.h

@@ -36,7 +36,7 @@ public:
 	 * @return the distance between the geometries
 	 * @throws ClassCastException if either item is not a Geometry
 	 */
-	double distance(const ItemBoundable* item1, const ItemBoundable* item2);
+	double distance(const ItemBoundable* item1, const ItemBoundable* item2) override;
 };
 }
 }

include/geos/index/strtree/ItemBoundable.h

@@ -34,9 +34,9 @@ class GEOS_DLL ItemBoundable: public Boundable
 public:
 
     ItemBoundable(const void* newBounds, void* newItem);
-	virtual ~ItemBoundable();
+	~ItemBoundable() override;
 
-    const void* getBounds() const;
+    const void* getBounds() const override;
 	void* getItem() const;
 
 private:

include/geos/index/strtree/SIRtree.h

@@ -55,7 +55,7 @@ public:
 	 */
 	SIRtree(std::size_t nodeCapacity);
 
-	virtual ~SIRtree();
+	~SIRtree() override;
 
 	void insert(double x1, double x2, void* item);
 
@@ -81,7 +81,7 @@ protected:
 
 	class SIRIntersectsOp:public AbstractSTRtree::IntersectsOp {
 	public:
-		bool intersects(const void* aBounds, const void* bBounds);
+		bool intersects(const void* aBounds, const void* bBounds) override;
 	};
 
 	/** \brief
@@ -89,13 +89,13 @@ protected:
 	 * M is the node capacity.
 	 */
 	std::unique_ptr<BoundableList> createParentBoundables(
-			BoundableList* childBoundables, int newLevel);
+			BoundableList* childBoundables, int newLevel) override;
 
-	AbstractNode* createNode(int level);
+	AbstractNode* createNode(int level) override;
 
-	IntersectsOp* getIntersectsOp() {return intersectsOp;}
+	IntersectsOp* getIntersectsOp() override {return intersectsOp;}
 
-	std::unique_ptr<BoundableList> sortBoundables(const BoundableList* input);
+	std::unique_ptr<BoundableList> sortBoundables(const BoundableList* input) override;
 
 private:
 

include/geos/index/strtree/STRtree.h

@@ -69,7 +69,7 @@ using AbstractSTRtree::query;
 private:
 	class GEOS_DLL STRIntersectsOp: public AbstractSTRtree::IntersectsOp {
 		public:
-			bool intersects(const void* aBounds, const void* bBounds);
+			bool intersects(const void* aBounds, const void* bBounds) override;
 	};
 
 	/**
@@ -79,13 +79,13 @@ private:
 	 * group them into runs of size M (the node capacity). For each run, creates
 	 * a new (parent) node.
 	 */
-	std::unique_ptr<BoundableList> createParentBoundables(BoundableList* childBoundables, int newLevel);
+	std::unique_ptr<BoundableList> createParentBoundables(BoundableList* childBoundables, int newLevel) override;
 
 	std::unique_ptr<BoundableList> createParentBoundablesFromVerticalSlices(std::vector<BoundableList*>* verticalSlices, int newLevel);
 
 	STRIntersectsOp intersectsOp;
 
-	std::unique_ptr<BoundableList> sortBoundables(const BoundableList* input);
+	std::unique_ptr<BoundableList> sortBoundables(const BoundableList* input) override;
 
 	std::unique_ptr<BoundableList> createParentBoundablesFromVerticalSlice(
 			BoundableList* childBoundables,
@@ -103,15 +103,15 @@ private:
 
 protected:
 
-	AbstractNode* createNode(int level);
+	AbstractNode* createNode(int level) override;
 
-	IntersectsOp* getIntersectsOp() {
+	IntersectsOp* getIntersectsOp() override {
 		return &intersectsOp;
 	}
 
 public:
 
-	~STRtree();
+	~STRtree() override;
 
 	/**
 	 * Constructs an STRtree with the given maximum number of child nodes that
@@ -119,7 +119,7 @@ public:
 	 */
 	STRtree(std::size_t nodeCapacity=10);
 
-	void insert(const geom::Envelope *itemEnv,void* item);
+	void insert(const geom::Envelope *itemEnv,void* item) override;
 
 	//static double centreX(const geom::Envelope *e);
 
@@ -131,11 +131,11 @@ public:
 		return STRtree::avg(e->getMinY(), e->getMaxY());
 	}
 
-	void query(const geom::Envelope *searchEnv, std::vector<void*>& matches) {
+	void query(const geom::Envelope *searchEnv, std::vector<void*>& matches) override {
 		AbstractSTRtree::query(searchEnv, matches);
 	}
 
-	void query(const geom::Envelope *searchEnv, ItemVisitor& visitor) {
+	void query(const geom::Envelope *searchEnv, ItemVisitor& visitor) override {
 		return AbstractSTRtree::query(searchEnv, visitor);
 	}
 
@@ -145,7 +145,7 @@ public:
 	std::pair<const void*, const void*> nearestNeighbour(BoundablePair* initBndPair, double maxDistance);
 	std::pair<const void*, const void*> nearestNeighbour(STRtree *tree, ItemDistance *itemDist);
 
-	bool remove(const geom::Envelope *itemEnv, void* item) {
+	bool remove(const geom::Envelope *itemEnv, void* item) override {
 		return AbstractSTRtree::remove(itemEnv, item);
 	}
 

include/geos/io/ParseException.h

@@ -44,7 +44,7 @@ public:
 
 	ParseException(const std::string& msg, double num);
 
-	~ParseException() throw() {}
+	~ParseException() throw() override {}
 
 private:
 	static std::string stringify(double num);

include/geos/noding/BasicSegmentString.h

@@ -64,26 +64,26 @@ public:
 		pts(newPts)
 	{}
 
-	virtual ~BasicSegmentString()
+	~BasicSegmentString() override
 	{}
 
 	/// see dox in SegmentString.h
-	virtual unsigned int size() const
+	unsigned int size() const override
 	{
 		return pts->size();
 	}
 
 	/// see dox in SegmentString.h
-	virtual const geom::Coordinate& getCoordinate(unsigned int i) const;
+	const geom::Coordinate& getCoordinate(unsigned int i) const override;
 
 	/// see dox in SegmentString.h
-	virtual geom::CoordinateSequence* getCoordinates() const;
+	geom::CoordinateSequence* getCoordinates() const override;
 
 	/// see dox in SegmentString.h
-	virtual bool isClosed() const;
+	bool isClosed() const override;
 
 	/// see dox in SegmentString.h
-	virtual std::ostream& print(std::ostream& os) const;
+	std::ostream& print(std::ostream& os) const override;
 
 	/** \brief
 	 * Gets the octant of the segment starting at vertex index.

include/geos/noding/IntersectionAdder.h

@@ -158,7 +158,7 @@ public:
 	 */
 	void processIntersections(
 		SegmentString* e0,  int segIndex0,
-		SegmentString* e1,  int segIndex1);
+		SegmentString* e1,  int segIndex1) override;
 
 
 	static bool isAdjacentSegments(int i1, int i2) {
@@ -170,7 +170,7 @@ public:
 	 *
 	 * @return false always
 	 */
-	virtual bool isDone() const {
+	bool isDone() const override {
 		return false;
 	}
 };

include/geos/noding/IntersectionFinderAdder.h

@@ -80,7 +80,7 @@ public:
 	 */
 	void processIntersections(
 		SegmentString* e0,  int segIndex0,
-		SegmentString* e1,  int segIndex1);
+		SegmentString* e1,  int segIndex1) override;
 
 	std::vector<geom::Coordinate>& getInteriorIntersections() {
 		return interiorIntersections;
@@ -91,7 +91,7 @@ public:
 	 *
 	 * @return false always
 	 */
-	virtual bool isDone() const {
+	bool isDone() const override {
 		return false;
 	}
 

include/geos/noding/IteratedNoder.h

@@ -80,7 +80,7 @@ public:
 	{
 	}
 
-	virtual ~IteratedNoder() {}
+	~IteratedNoder() override {}
 
 	/**
 	 * Sets the maximum number of noding iterations performed before
@@ -93,7 +93,7 @@ public:
 	 */
 	void setMaximumIterations(int n) { maxIter = n; }
 
-	std::vector<SegmentString*>* getNodedSubstrings() const {
+	std::vector<SegmentString*>* getNodedSubstrings() const override {
 		return nodedSegStrings;
 	}
 
@@ -107,7 +107,7 @@ public:
 	 * @param segStrings a collection of SegmentStrings to be noded
 	 * @throws TopologyException if the iterated noding fails to converge.
 	 */
-	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings); // throw(GEOSException);
+	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings) override; // throw(GEOSException);
 };
 
 } // namespace geos::noding

include/geos/noding/MCIndexNoder.h

@@ -84,16 +84,16 @@ public:
 		nOverlaps(0)
 	{}
 
-	~MCIndexNoder();
+	~MCIndexNoder() override;
 
 	/// Return a reference to this instance's std::vector of MonotoneChains
 	std::vector<index::chain::MonotoneChain*>& getMonotoneChains() { return monoChains; }
 
 	index::SpatialIndex& getIndex();
 
-	std::vector<SegmentString*>* getNodedSubstrings() const;
+	std::vector<SegmentString*>* getNodedSubstrings() const override;
 
-	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings);
+	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings) override;
 
 	class SegmentOverlapAction : public index::chain::MonotoneChainOverlapAction {
 	public:
@@ -104,7 +104,7 @@ public:
 		{}
 
 		void overlap(index::chain::MonotoneChain& mc1, std::size_t start1,
-            index::chain::MonotoneChain& mc2, std::size_t start2);
+            index::chain::MonotoneChain& mc2, std::size_t start2) override;
     private:
         SegmentIntersector& si;
 

include/geos/noding/MCIndexSegmentSetMutualIntersector.h

@@ -57,7 +57,7 @@ public:
 
 	MCIndexSegmentSetMutualIntersector();
 
-	~MCIndexSegmentSetMutualIntersector();
+	~MCIndexSegmentSetMutualIntersector() override;
 
 	/* Returns a reference to a vector of MonotoneChain objects owned
 	 * by this class and destroyed on next call to ::process.
@@ -73,10 +73,10 @@ public:
 		return index;
 	}
 
-	void setBaseSegments(SegmentString::ConstVect* segStrings);
+	void setBaseSegments(SegmentString::ConstVect* segStrings) override;
 
 	// NOTE: re-populates the MonotoneChain vector with newly created chains
-	void process(SegmentString::ConstVect* segStrings);
+	void process(SegmentString::ConstVect* segStrings) override;
 
     class SegmentOverlapAction : public index::chain::MonotoneChainOverlapAction
     {
@@ -93,7 +93,7 @@ public:
           {}
 
           void overlap(index::chain::MonotoneChain& mc1, std::size_t start1,
-              index::chain::MonotoneChain& mc2, std::size_t start2);
+              index::chain::MonotoneChain& mc2, std::size_t start2) override;
     };
 
 private:

include/geos/noding/NodedSegmentString.h

@@ -101,7 +101,7 @@ public:
         , pts(newPts)
     {}
 
-	~NodedSegmentString()
+	~NodedSegmentString() override
 	{
 		delete pts;
 	}
@@ -143,18 +143,18 @@ public:
 
 	const SegmentNodeList& getNodeList() const;
 
-	virtual unsigned int size() const
+	unsigned int size() const override
 	{
 		return static_cast<unsigned int>(pts->size());
 	}
 
-	virtual const geom::Coordinate& getCoordinate(unsigned int i) const;
+	const geom::Coordinate& getCoordinate(unsigned int i) const override;
 
-	virtual geom::CoordinateSequence* getCoordinates() const;
+	geom::CoordinateSequence* getCoordinates() const override;
 
-	virtual bool isClosed() const;
+	bool isClosed() const override;
 
-	virtual std::ostream& print(std::ostream& os) const;
+	std::ostream& print(std::ostream& os) const override;
 
 
 	/** \brief

include/geos/noding/ScaledNoder.h

@@ -74,11 +74,11 @@ public:
 		isScaled(nScaleFactor!=1.0)
 	{}
 
-	~ScaledNoder();
+	~ScaledNoder() override;
 
-	std::vector<SegmentString*>* getNodedSubstrings() const;
+	std::vector<SegmentString*>* getNodedSubstrings() const override;
 
-	void computeNodes(std::vector<SegmentString*>* inputSegStr);
+	void computeNodes(std::vector<SegmentString*>* inputSegStr) override;
 
 	//void filter(Coordinate& c);
 

include/geos/noding/SegmentIntersectionDetector.h

@@ -69,7 +69,7 @@ public:
 		intSegments( nullptr)
 	{ }
 
-	~SegmentIntersectionDetector()
+	~SegmentIntersectionDetector() override
 	{
 		//delete intPt;
 		delete intSegments;
@@ -138,7 +138,7 @@ public:
 		return intSegments;
 	}
 
-	bool isDone() const
+	bool isDone() const override
 	{
 		// If finding all types, we can stop
 		// when both possible types have been found.
@@ -161,7 +161,7 @@ public:
 	 * (e.g. by an disjoint envelope test).
 	 */
 	void processIntersections(	noding::SegmentString * e0, int segIndex0,
-								noding::SegmentString * e1, int segIndex1 );
+								noding::SegmentString * e1, int segIndex1 ) override;
 
 };
 

include/geos/noding/SimpleNoder.h

@@ -59,9 +59,9 @@ public:
 		SinglePassNoder(nSegInt)
 	{}
 
-	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings);
+	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings) override;
 
-	std::vector<SegmentString*>* getNodedSubstrings() const {
+	std::vector<SegmentString*>* getNodedSubstrings() const override {
 		return NodedSegmentString::getNodedSubstrings(*nodedSegStrings);
 	}
 };

include/geos/noding/SingleInteriorIntersectionFinder.h

@@ -100,9 +100,9 @@ public:
 	 */
 	void processIntersections(
 		SegmentString* e0,  int segIndex0,
-		SegmentString* e1,  int segIndex1);
+		SegmentString* e1,  int segIndex1) override;
 
-	bool isDone() const
+	bool isDone() const override
 	{
 		return !interiorIntersection.isNull();
 	}

include/geos/noding/SinglePassNoder.h

@@ -58,7 +58,7 @@ public:
 
 	SinglePassNoder(SegmentIntersector* nSegInt=nullptr): segInt(nSegInt) {}
 
-	virtual ~SinglePassNoder() {}
+	~SinglePassNoder() override {}
 
 	/**
 	 * Sets the SegmentIntersector to use with this noder.
@@ -78,7 +78,7 @@ public:
 	 *
 	 * @param segStrings a collection of {@link SegmentString}s to node
 	 */
-	virtual void computeNodes(std::vector<SegmentString*>* segStrings)=0;
+	void computeNodes(std::vector<SegmentString*>* segStrings) override =0;
 
 	/**
 	 * Returns a {@link Collection} of fully noded {@link SegmentStrings}.
@@ -86,7 +86,7 @@ public:
 	 *
 	 * @return a Collection of SegmentStrings
 	 */
-	virtual std::vector<SegmentString*>* getNodedSubstrings() const=0;
+	std::vector<SegmentString*>* getNodedSubstrings() const override =0;
 
 };
 

include/geos/noding/snapround/MCIndexSnapRounder.h

@@ -84,11 +84,11 @@ public:
     li.setPrecisionModel(&pm);
   }
 
-	std::vector<SegmentString*>* getNodedSubstrings() const {
+	std::vector<SegmentString*>* getNodedSubstrings() const override {
 	  return NodedSegmentString::getNodedSubstrings(*nodedSegStrings);
   }
 
-	void computeNodes(std::vector<SegmentString*>* segStrings);
+	void computeNodes(std::vector<SegmentString*>* segStrings) override;
 
 	/**
 	 * Computes nodes introduced as a result of

include/geos/noding/snapround/SimpleSnapRounder.h

@@ -76,9 +76,9 @@ public:
 
 	SimpleSnapRounder(const geom::PrecisionModel& newPm);
 
-	std::vector<SegmentString*>* getNodedSubstrings() const;
+	std::vector<SegmentString*>* getNodedSubstrings() const override;
 
-	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings);
+	void computeNodes(std::vector<SegmentString*>* inputSegmentStrings) override;
 
 	void add(const SegmentString* segStr);
 

include/geos/operation/distance/ConnectedElementLocationFilter.h

@@ -68,8 +68,8 @@ public:
 		locations(newLocations)
 	{}
 
-	void filter_ro(const geom::Geometry *geom);
-	void filter_rw(geom::Geometry *geom);
+	void filter_ro(const geom::Geometry *geom) override;
+	void filter_rw(geom::Geometry *geom) override;
 };
 
 

include/geos/operation/distance/ConnectedElementPointFilter.h

@@ -62,7 +62,7 @@ public:
 		pts(newPts)
 	{}
 
-	void filter_ro(const geom::Geometry *geom);
+	void filter_ro(const geom::Geometry *geom) override;
 
 	//void filter_rw(geom::Geometry * /*geom*/) {};
 };

include/geos/operation/linemerge/LineMergeGraph.h

@@ -80,7 +80,7 @@ public:
 	 */
 	void addEdge(const geom::LineString *lineString);
 
-	~LineMergeGraph();
+	~LineMergeGraph() override;
 };
 } // namespace geos::operation::linemerge
 } // namespace geos::operation

include/geos/operation/overlay/ElevationMatrix.h

@@ -62,9 +62,9 @@ class GEOS_DLL ElevationMatrixFilter: public geom::CoordinateFilter
 {
 public:
 	ElevationMatrixFilter(ElevationMatrix &em);
-	~ElevationMatrixFilter();
-	void filter_rw(geom::Coordinate *c) const;
-	void filter_ro(const geom::Coordinate *c);
+	~ElevationMatrixFilter() override;
+	void filter_rw(geom::Coordinate *c) const override;
+	void filter_ro(const geom::Coordinate *c) override;
 private:
 	ElevationMatrix &em;
 	double avgElevation;

include/geos/operation/overlay/MaximalEdgeRing.h

@@ -71,11 +71,11 @@ public:
 		const geom::GeometryFactory *geometryFactory);
 			// throw(const TopologyException &)
 
-	virtual ~MaximalEdgeRing();
+	~MaximalEdgeRing() override;
 
-	geomgraph::DirectedEdge* getNext(geomgraph::DirectedEdge *de);
+	geomgraph::DirectedEdge* getNext(geomgraph::DirectedEdge *de) override;
 
-	void setEdgeRing(geomgraph::DirectedEdge* de, geomgraph::EdgeRing* er);
+	void setEdgeRing(geomgraph::DirectedEdge* de, geomgraph::EdgeRing* er) override;
 
 	/// \brief
 	/// This function returns a newly allocated vector of

include/geos/operation/overlay/MinimalEdgeRing.h

@@ -61,12 +61,12 @@ public:
 	MinimalEdgeRing(geomgraph::DirectedEdge *start,
 		const geom::GeometryFactory *geometryFactory);
 
-	virtual ~MinimalEdgeRing();
+	~MinimalEdgeRing() override;
 
-	geomgraph::DirectedEdge* getNext(geomgraph::DirectedEdge *de);
+	geomgraph::DirectedEdge* getNext(geomgraph::DirectedEdge *de) override;
 
 	void setEdgeRing(geomgraph::DirectedEdge *de,
-			geomgraph::EdgeRing *er);
+			geomgraph::EdgeRing *er) override;
 };
 
 

include/geos/operation/overlay/OverlayNodeFactory.h

@@ -46,7 +46,7 @@ namespace overlay { // geos::operation::overlay
 class GEOS_DLL OverlayNodeFactory: public geomgraph::NodeFactory {
 public:
 	OverlayNodeFactory():geomgraph::NodeFactory() {}
-	geomgraph::Node* createNode(const geom::Coordinate &coord) const;
+	geomgraph::Node* createNode(const geom::Coordinate &coord) const override;
 	static const geomgraph::NodeFactory &instance();
 };
 

include/geos/operation/overlay/OverlayOp.h

@@ -126,7 +126,7 @@ public:
 	///
 	OverlayOp(const geom::Geometry *g0, const geom::Geometry *g1);
 
-	virtual ~OverlayOp(); // FIXME: virtual ?
+	~OverlayOp() override; // FIXME: virtual ?
 
 	/**
 	 * Gets the result of the overlay for a given overlay operation.

include/geos/operation/polygonize/PolygonizeGraph.h

@@ -86,7 +86,7 @@ public:
 	 * \brief
 	 * Destroy a polygonization graph.
 	 */
-	~PolygonizeGraph();
+	~PolygonizeGraph() override;
 
 	/**
 	 * \brief

include/geos/operation/polygonize/Polygonizer.h

@@ -80,7 +80,7 @@ private:
 		Polygonizer *pol;
 		LineStringAdder(Polygonizer *p);
 		//void filter_rw(geom::Geometry *g);
-		void filter_ro(const geom::Geometry * g);
+		void filter_ro(const geom::Geometry * g) override;
 	};
 
 	// default factory

include/geos/operation/relate/EdgeEndBundle.h

@@ -48,11 +48,11 @@ class GEOS_DLL EdgeEndBundle: public geomgraph::EdgeEnd
 {
 public:
 	EdgeEndBundle(geomgraph::EdgeEnd *e);
-	virtual ~EdgeEndBundle();
+	~EdgeEndBundle() override;
 	std::vector<geomgraph::EdgeEnd*>* getEdgeEnds();
 	void insert(geomgraph::EdgeEnd *e);
 
-	void computeLabel(const algorithm::BoundaryNodeRule& bnr);
+	void computeLabel(const algorithm::BoundaryNodeRule& bnr) override;
 
   /**
    * \brief

include/geos/operation/relate/EdgeEndBundleStar.h

@@ -51,8 +51,8 @@ public:
 	/// Creates a new empty EdgeEndBundleStar
 	EdgeEndBundleStar() {}
 
-	virtual ~EdgeEndBundleStar();
-	void insert(geomgraph::EdgeEnd *e);
+	~EdgeEndBundleStar() override;
+	void insert(geomgraph::EdgeEnd *e) override;
 
 	/**
 	 * Update the IM with the contribution for the EdgeStubs around the node.

include/geos/operation/relate/RelateNode.h

@@ -49,7 +49,7 @@ public:
 
 	RelateNode(const geom::Coordinate& coord, geomgraph::EdgeEndStar *edges);
 
-	virtual ~RelateNode();
+	~RelateNode() override;
 
 	/**
 	 * Update the IM with the contribution for the EdgeEnds incident on this node.
@@ -58,7 +58,7 @@ public:
 
 protected:
 
-	void computeIM(geom::IntersectionMatrix& im);
+	void computeIM(geom::IntersectionMatrix& im) override;
 };
 
 

include/geos/operation/relate/RelateNodeFactory.h

@@ -43,7 +43,7 @@ namespace relate { // geos::operation::relate
  */
 class GEOS_DLL RelateNodeFactory: public geomgraph::NodeFactory {
 public:
-	geomgraph::Node* createNode(const geom::Coordinate &coord) const;
+	geomgraph::Node* createNode(const geom::Coordinate &coord) const override;
 	static const geomgraph::NodeFactory &instance();
 private:
 	RelateNodeFactory() {}

include/geos/operation/relate/RelateOp.h

@@ -112,7 +112,7 @@ public:
 	         const geom::Geometry *g1,
 	         const algorithm::BoundaryNodeRule& boundaryNodeRule);
 
-	virtual ~RelateOp();
+	~RelateOp() override;
 
 	/** \brief
 	 * Gets the IntersectionMatrix for the spatial relationship

include/geos/operation/valid/SweeplineNestedRingTester.h

@@ -102,7 +102,7 @@ public:
 		bool isNonNested;
 		OverlapAction(SweeplineNestedRingTester *p);
 		void overlap(index::sweepline::SweepLineInterval *s0,
-				index::sweepline::SweepLineInterval *s1);
+				index::sweepline::SweepLineInterval *s1) override;
 	private:
 		SweeplineNestedRingTester *parent;
 	};

include/geos/planargraph/Node.h

@@ -71,7 +71,7 @@ public:
 		pt(newPt)
 		{ deStar=new DirectedEdgeStar(); }
 
-	virtual ~Node() {
+	~Node() override {
 		delete deStar;
 	}
 

include/geos/precision/PrecisionReducerCoordinateOperation.h

@@ -59,7 +59,7 @@ public:
   //
   /// virtual function
 	geom::CoordinateSequence* edit(const geom::CoordinateSequence *coordinates,
-	                         const geom::Geometry *geom);
+	                         const geom::Geometry *geom) override;
 };
 
 } // namespace geos.precision

include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h

@@ -57,7 +57,7 @@ public:
 	 * The search starts from the last located edge amd proceeds on the general direction of v.
 	 * @return The caller _does not_ take ownership of the returned object.
 	 */
-	virtual QuadEdge* locate(const Vertex &v);
+	QuadEdge* locate(const Vertex &v) override;
 };
 
 } //namespace geos.triangulate.quadedge

include/geos/util/AssertionFailedException.h

@@ -41,7 +41,7 @@ public:
 		GEOSException("AssertionFailedException", msg)
 	{}
 
-	~AssertionFailedException() throw() {}
+	~AssertionFailedException() throw() override {}
 };
 
 } // namespace geos.util

include/geos/util/GEOSException.h

@@ -57,10 +57,10 @@ public:
 		_msg(name+": "+msg)
 	{}
 
-	virtual ~GEOSException() throw()
+	~GEOSException() throw() override
 	{}
 
-	const char* what() const throw()
+	const char* what() const throw() override
 	{
 		return _msg.c_str();
 	}

include/geos/util/IllegalArgumentException.h

@@ -43,7 +43,7 @@ public:
 		GEOSException("IllegalArgumentException", msg)
 	{}
 
-	~IllegalArgumentException() throw() {}
+	~IllegalArgumentException() throw() override {}
 };
 
 } // namespace geos::util

include/geos/util/IllegalStateException.h

@@ -36,7 +36,7 @@ public:
 		GEOSException("IllegalStateException", msg)
 	{}
 
-	~IllegalStateException() throw() {}
+	~IllegalStateException() throw() override {}
 };
 
 } // namespace geos::util

include/geos/util/TopologyException.h

@@ -50,7 +50,7 @@ public:
 		pt(newPt)
 	{}
 
-	~TopologyException() throw() {}
+	~TopologyException() throw() override {}
 	geom::Coordinate& getCoordinate() { return pt; }
 private:
 	geom::Coordinate pt;

include/geos/util/UniqueCoordinateArrayFilter.h

@@ -57,14 +57,14 @@ public:
 	 * delete a derived-class object via a base-class pointer.
 	 * http://www.parashift.com/c++-faq-lite/virtual-functions.html#faq-20.7
 	 */
-	virtual ~UniqueCoordinateArrayFilter() {}
+	~UniqueCoordinateArrayFilter() override {}
 
 	/**
 	 * Performs a filtering operation with or on coord in "read-only" mode.
 	 * @param coord The "read-only" Coordinate to which
 	 * 				the filter is applied.
 	 */
-	virtual void filter_ro(const geom::Coordinate *coord)
+	void filter_ro(const geom::Coordinate *coord) override
 	{
 		if ( uniqPts.insert(coord).second )
 		{

include/geos/util/UnsupportedOperationException.h

@@ -45,7 +45,7 @@ public:
 		GEOSException("UnsupportedOperationException", msg)
 	{}
 
-	~UnsupportedOperationException() throw() {}
+	~UnsupportedOperationException() throw() override {}
 };
 
 } // namespace geos::util

src/algorithm/BoundaryNodeRule.cpp

@@ -44,7 +44,7 @@ namespace {
 class Mod2BoundaryNodeRule : public BoundaryNodeRule
 {
 public:
-	bool isInBoundary(int boundaryCount) const
+	bool isInBoundary(int boundaryCount) const override
 	{
 		// the "Mod-2 Rule"
 		return boundaryCount % 2 == 1;
@@ -81,7 +81,7 @@ public:
  */
 class EndPointBoundaryNodeRule : public BoundaryNodeRule
 {
-	bool isInBoundary(int boundaryCount) const
+	bool isInBoundary(int boundaryCount) const override
 	{
 		return boundaryCount > 0;
 	}
@@ -99,7 +99,7 @@ class EndPointBoundaryNodeRule : public BoundaryNodeRule
  */
 class MultiValentEndPointBoundaryNodeRule : public BoundaryNodeRule
 {
-	bool isInBoundary(int boundaryCount) const
+	bool isInBoundary(int boundaryCount) const override
 	{
 		return boundaryCount > 1;
 	}
@@ -116,7 +116,7 @@ class MultiValentEndPointBoundaryNodeRule : public BoundaryNodeRule
  */
 class MonoValentEndPointBoundaryNodeRule : public BoundaryNodeRule
 {
-	bool isInBoundary(int boundaryCount) const
+	bool isInBoundary(int boundaryCount) const override
 	{
 		return boundaryCount == 1;
 	}

src/geom/GeometryFactory.cpp

@@ -68,7 +68,7 @@ public:
       : _gsf(gsf)
   {}
   CoordinateSequence* edit( const CoordinateSequence *coordSeq,
-                            const Geometry * )
+                            const Geometry * ) override
   {
     return _gsf->create(*coordSeq);
   }

src/index/strtree/SIRtree.cpp

@@ -91,14 +91,14 @@ public:
 		AbstractNode(level, capacity)
 	{}
 
-	~SIRAbstractNode()
+	~SIRAbstractNode() override
 	{
 		delete (Interval *)bounds;
 	}
 
 protected:
 
-	void* computeBounds() const
+	void* computeBounds() const override
 	{
 		Interval* bounds=nullptr;
 		const BoundableList& b = *getChildBoundables();

src/index/strtree/STRtree.cpp

@@ -282,14 +282,14 @@ public:
 		AbstractNode(level, capacity)
 	{}
 
-	~STRAbstractNode()
+	~STRAbstractNode() override
 	{
 		delete (Envelope *)bounds;
 	}
 
 protected:
 
-	void* computeBounds() const
+	void* computeBounds() const override
 	{
 		Envelope* bounds=nullptr;
 		const BoundableList& b = *getChildBoundables();

src/noding/GeometryNoder.cpp

@@ -53,7 +53,7 @@ public:
     : _to(to)
   {}
 
-  void filter_ro(const geom::Geometry * g) {
+  void filter_ro(const geom::Geometry * g) override {
     const geom::LineString *ls = dynamic_cast<const geom::LineString *>(g);
     if ( ls ) {
       geom::CoordinateSequence* coord = ls->getCoordinates();