[geos-commits] r3497 - in trunk: capi include/geos/algorithm
include/geos/geom include/geos/geom/prep
include/geos/geomgraph include/geos/geomgraph/index
include/geos/index/chain include/geos/index/strtree
include/geos/io include/geos/noding
include/geos/operation/relate include/geos/operation/valid
include/geos/planargraph include/geos/util src/precision
svn_geos at osgeo.org
svn_geos at osgeo.org
Tue Oct 4 16:46:04 EDT 2011
Author: hobu
Date: 2011-10-04 13:46:04 -0700 (Tue, 04 Oct 2011)
New Revision: 3497
Modified:
trunk/capi/geos_ts_c.cpp
trunk/include/geos/algorithm/CGAlgorithms.h
trunk/include/geos/algorithm/PointInRing.h
trunk/include/geos/geom/MultiPoint.h
trunk/include/geos/geom/prep/PreparedGeometry.h
trunk/include/geos/geomgraph/EdgeEndStar.h
trunk/include/geos/geomgraph/Node.h
trunk/include/geos/geomgraph/NodeFactory.h
trunk/include/geos/geomgraph/index/EdgeSetIntersector.h
trunk/include/geos/geomgraph/index/MonotoneChainIndexer.h
trunk/include/geos/geomgraph/index/SweepLineEventObj.h
trunk/include/geos/index/chain/MonotoneChainOverlapAction.h
trunk/include/geos/index/strtree/Boundable.h
trunk/include/geos/index/strtree/SIRtree.h
trunk/include/geos/index/strtree/STRtree.h
trunk/include/geos/io/ParseException.h
trunk/include/geos/io/StringTokenizer.h
trunk/include/geos/io/WKBReader.h
trunk/include/geos/noding/Noder.h
trunk/include/geos/noding/SimpleNoder.h
trunk/include/geos/operation/relate/RelateNodeFactory.h
trunk/include/geos/operation/valid/RepeatedPointTester.h
trunk/include/geos/planargraph/GraphComponent.h
trunk/include/geos/util/IllegalArgumentException.h
trunk/include/geos/util/IllegalStateException.h
trunk/include/geos/util/UnsupportedOperationException.h
trunk/src/precision/CommonBitsRemover.cpp
Log:
remove extra ;'s to satisfy pedantic warning
Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/capi/geos_ts_c.cpp 2011-10-04 20:46:04 UTC (rev 3497)
@@ -145,8 +145,8 @@
void *userdata;
public:
CAPI_ItemVisitor (GEOSQueryCallback cb, void *ud)
- : ItemVisitor(), callback(cb), userdata(ud) {};
- void visitItem (void *item) { callback(item, userdata); };
+ : ItemVisitor(), callback(cb), userdata(ud) {}
+ void visitItem (void *item) { callback(item, userdata); }
};
Modified: trunk/include/geos/algorithm/CGAlgorithms.h
===================================================================
--- trunk/include/geos/algorithm/CGAlgorithms.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/algorithm/CGAlgorithms.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -60,7 +60,7 @@
STRAIGHT
};
- CGAlgorithms(){};
+ CGAlgorithms(){}
/** \brief
* Tests whether a point lies inside a ring.
Modified: trunk/include/geos/algorithm/PointInRing.h
===================================================================
--- trunk/include/geos/algorithm/PointInRing.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/algorithm/PointInRing.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -30,7 +30,7 @@
class GEOS_DLL PointInRing{
public:
- virtual ~PointInRing(){};
+ virtual ~PointInRing(){}
virtual bool isInside(const geom::Coordinate& pt)=0;
};
Modified: trunk/include/geos/geom/MultiPoint.h
===================================================================
--- trunk/include/geos/geom/MultiPoint.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geom/MultiPoint.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -84,7 +84,7 @@
bool equalsExact(const Geometry *other, double tolerance=0) const;
- Geometry *clone() const { return new MultiPoint(*this); };
+ Geometry *clone() const { return new MultiPoint(*this); }
protected:
Modified: trunk/include/geos/geom/prep/PreparedGeometry.h
===================================================================
--- trunk/include/geos/geom/prep/PreparedGeometry.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geom/prep/PreparedGeometry.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -52,7 +52,7 @@
*/
class GEOS_DLL PreparedGeometry {
public:
- virtual ~PreparedGeometry() {};
+ virtual ~PreparedGeometry() {}
/**
* Gets the original {@link Geometry} which has been prepared.
Modified: trunk/include/geos/geomgraph/EdgeEndStar.h
===================================================================
--- trunk/include/geos/geomgraph/EdgeEndStar.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/EdgeEndStar.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -70,7 +70,7 @@
EdgeEndStar();
- virtual ~EdgeEndStar() {};
+ virtual ~EdgeEndStar() {}
/** \brief
* Insert a EdgeEnd into this EdgeEndStar
Modified: trunk/include/geos/geomgraph/Node.h
===================================================================
--- trunk/include/geos/geomgraph/Node.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/Node.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -140,7 +140,7 @@
/** \brief
* Basic nodes do not compute IMs
*/
- virtual void computeIM(geom::IntersectionMatrix& /*im*/) {};
+ virtual void computeIM(geom::IntersectionMatrix& /*im*/) {}
private:
Modified: trunk/include/geos/geomgraph/NodeFactory.h
===================================================================
--- trunk/include/geos/geomgraph/NodeFactory.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/NodeFactory.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -43,7 +43,7 @@
static const NodeFactory &instance();
virtual ~NodeFactory() {}
protected:
- NodeFactory() {};
+ NodeFactory() {}
};
Modified: trunk/include/geos/geomgraph/index/EdgeSetIntersector.h
===================================================================
--- trunk/include/geos/geomgraph/index/EdgeSetIntersector.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/index/EdgeSetIntersector.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -56,7 +56,7 @@
std::vector<Edge*> *edges1,
SegmentIntersector *si)=0;
- virtual ~EdgeSetIntersector(){};
+ virtual ~EdgeSetIntersector(){}
};
Modified: trunk/include/geos/geomgraph/index/MonotoneChainIndexer.h
===================================================================
--- trunk/include/geos/geomgraph/index/MonotoneChainIndexer.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/index/MonotoneChainIndexer.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -35,7 +35,7 @@
public:
- MonotoneChainIndexer(){};
+ MonotoneChainIndexer(){}
void getChainStartIndices(const geom::CoordinateSequence*, std::vector<int>&);
Modified: trunk/include/geos/geomgraph/index/SweepLineEventObj.h
===================================================================
--- trunk/include/geos/geomgraph/index/SweepLineEventObj.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/geomgraph/index/SweepLineEventObj.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -28,7 +28,7 @@
// inherit from it.
class GEOS_DLL SweepLineEventOBJ {
public:
- virtual ~SweepLineEventOBJ(){};
+ virtual ~SweepLineEventOBJ(){}
};
Modified: trunk/include/geos/index/chain/MonotoneChainOverlapAction.h
===================================================================
--- trunk/include/geos/index/chain/MonotoneChainOverlapAction.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/index/chain/MonotoneChainOverlapAction.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -51,9 +51,9 @@
public:
- MonotoneChainOverlapAction() {};
+ MonotoneChainOverlapAction() {}
- virtual ~MonotoneChainOverlapAction() {};
+ virtual ~MonotoneChainOverlapAction() {}
/**
* This function can be overridden if the original chains are needed
Modified: trunk/include/geos/index/strtree/Boundable.h
===================================================================
--- trunk/include/geos/index/strtree/Boundable.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/index/strtree/Boundable.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -38,7 +38,7 @@
* @see AbstractSTRtree::IntersectsOp
*/
virtual const void* getBounds() const=0;
- virtual ~Boundable() {};
+ virtual ~Boundable() {}
};
Modified: trunk/include/geos/index/strtree/SIRtree.h
===================================================================
--- trunk/include/geos/index/strtree/SIRtree.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/index/strtree/SIRtree.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -93,7 +93,7 @@
AbstractNode* createNode(int level);
- IntersectsOp* getIntersectsOp() {return intersectsOp;};
+ IntersectsOp* getIntersectsOp() {return intersectsOp;}
std::auto_ptr<BoundableList> sortBoundables(const BoundableList* input);
Modified: trunk/include/geos/index/strtree/STRtree.h
===================================================================
--- trunk/include/geos/index/strtree/STRtree.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/index/strtree/STRtree.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -105,7 +105,7 @@
IntersectsOp* getIntersectsOp() {
return &intersectsOp;
- };
+ }
public:
Modified: trunk/include/geos/io/ParseException.h
===================================================================
--- trunk/include/geos/io/ParseException.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/io/ParseException.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -44,7 +44,7 @@
ParseException(const std::string& msg, double num);
- ~ParseException() throw() {};
+ ~ParseException() throw() {}
private:
static std::string stringify(double num);
Modified: trunk/include/geos/io/StringTokenizer.h
===================================================================
--- trunk/include/geos/io/StringTokenizer.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/io/StringTokenizer.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -42,7 +42,7 @@
};
//StringTokenizer();
StringTokenizer(const std::string& txt);
- ~StringTokenizer() {};
+ ~StringTokenizer() {}
int nextToken();
int peekNextToken();
double getNVal();
Modified: trunk/include/geos/io/WKBReader.h
===================================================================
--- trunk/include/geos/io/WKBReader.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/io/WKBReader.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -80,7 +80,7 @@
public:
- WKBReader(geom::GeometryFactory const& f): factory(f) {};
+ WKBReader(geom::GeometryFactory const& f): factory(f) {}
/// Inizialize parser with default GeometryFactory.
WKBReader();
Modified: trunk/include/geos/noding/Noder.h
===================================================================
--- trunk/include/geos/noding/Noder.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/noding/Noder.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -70,7 +70,7 @@
virtual ~Noder() {}
protected:
- Noder(){};
+ Noder(){}
};
} // namespace geos.noding
Modified: trunk/include/geos/noding/SimpleNoder.h
===================================================================
--- trunk/include/geos/noding/SimpleNoder.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/noding/SimpleNoder.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -57,7 +57,7 @@
SimpleNoder(SegmentIntersector* nSegInt=NULL)
:
SinglePassNoder(nSegInt)
- {};
+ {}
void computeNodes(std::vector<SegmentString*>* inputSegmentStrings);
Modified: trunk/include/geos/operation/relate/RelateNodeFactory.h
===================================================================
--- trunk/include/geos/operation/relate/RelateNodeFactory.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/operation/relate/RelateNodeFactory.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -46,7 +46,7 @@
geomgraph::Node* createNode(const geom::Coordinate &coord) const;
static const geomgraph::NodeFactory &instance();
private:
- RelateNodeFactory() {};
+ RelateNodeFactory() {}
};
Modified: trunk/include/geos/operation/valid/RepeatedPointTester.h
===================================================================
--- trunk/include/geos/operation/valid/RepeatedPointTester.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/operation/valid/RepeatedPointTester.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -48,7 +48,7 @@
*/
class GEOS_DLL RepeatedPointTester {
public:
- RepeatedPointTester() {};
+ RepeatedPointTester() {}
geom::Coordinate& getCoordinate();
bool hasRepeatedPoint(const geom::Geometry *g);
bool hasRepeatedPoint(const geom::CoordinateSequence *coord);
Modified: trunk/include/geos/planargraph/GraphComponent.h
===================================================================
--- trunk/include/geos/planargraph/GraphComponent.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/planargraph/GraphComponent.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -61,7 +61,7 @@
isVisitedVar(false)
{}
- virtual ~GraphComponent() {};
+ virtual ~GraphComponent() {}
/** \brief
* Tests if a component has been visited during the course
Modified: trunk/include/geos/util/IllegalArgumentException.h
===================================================================
--- trunk/include/geos/util/IllegalArgumentException.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/util/IllegalArgumentException.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -43,7 +43,7 @@
GEOSException("IllegalArgumentException", msg)
{}
- ~IllegalArgumentException() throw() {};
+ ~IllegalArgumentException() throw() {}
};
} // namespace geos::util
Modified: trunk/include/geos/util/IllegalStateException.h
===================================================================
--- trunk/include/geos/util/IllegalStateException.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/util/IllegalStateException.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -36,7 +36,7 @@
GEOSException("IllegalStateException", msg)
{}
- ~IllegalStateException() throw() {};
+ ~IllegalStateException() throw() {}
};
} // namespace geos::util
Modified: trunk/include/geos/util/UnsupportedOperationException.h
===================================================================
--- trunk/include/geos/util/UnsupportedOperationException.h 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/include/geos/util/UnsupportedOperationException.h 2011-10-04 20:46:04 UTC (rev 3497)
@@ -45,7 +45,7 @@
GEOSException("UnsupportedOperationException", msg)
{}
- ~UnsupportedOperationException() throw() {};
+ ~UnsupportedOperationException() throw() {}
};
} // namespace geos::util
Modified: trunk/src/precision/CommonBitsRemover.cpp
===================================================================
--- trunk/src/precision/CommonBitsRemover.cpp 2011-10-04 16:18:04 UTC (rev 3496)
+++ trunk/src/precision/CommonBitsRemover.cpp 2011-10-04 20:46:04 UTC (rev 3497)
@@ -53,7 +53,7 @@
{
::geos::ignore_unused_variable_warning(coord);
assert(0);
- };
+ }
void filter_rw(geom::Coordinate *coord) const
{
More information about the geos-commits
mailing list