[geos-commits] r2383 - in trunk: source/headers/geos/geom tests/xmltester

[svn_geos at osgeo.org]

Author: strk
Date: 2009-04-17 11:37:32 -0400 (Fri, 17 Apr 2009)
New Revision: 2383

Modified:
   trunk/source/headers/geos/geom/BinaryOp.h
   trunk/tests/xmltester/Makefile.am
   trunk/tests/xmltester/XMLTester.cpp
Log:
proper inline check_valid source/headers/geos/geom/BinaryOp.h

Modified: trunk/source/headers/geos/geom/BinaryOp.h
===================================================================
--- trunk/source/headers/geos/geom/BinaryOp.h	2009-04-17 15:34:57 UTC (rev 2382)
+++ trunk/source/headers/geos/geom/BinaryOp.h	2009-04-17 15:37:32 UTC (rev 2383)
@@ -108,7 +108,7 @@
 namespace geos {
 namespace geom { // geos::geom
 
-bool
+inline bool
 check_valid(const Geometry& g, const std::string& label)
 {
 	operation::valid::IsValidOp ivo(&g);

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2009-04-17 15:34:57 UTC (rev 2382)
+++ trunk/tests/xmltester/Makefile.am	2009-04-17 15:37:32 UTC (rev 2383)
@@ -27,7 +27,7 @@
 SimpleWKTTester_SOURCES = SimpleWKTTester.cpp
 SimpleWKTTester_LDADD = $(LIBS)
 
-XMLTester_SOURCES = XMLTester.cpp markup/MarkupSTL.cpp markup/MarkupSTL.h XMLTester.h
+XMLTester_SOURCES = XMLTester.cpp markup/MarkupSTL.cpp markup/MarkupSTL.h XMLTester.h BufferResultMatcher.h BufferResultMatcher.cpp
 XMLTester_LDADD = $(LIBS)
 
 INCLUDES = -I$(top_srcdir)/source/headers

Modified: trunk/tests/xmltester/XMLTester.cpp
===================================================================
--- trunk/tests/xmltester/XMLTester.cpp	2009-04-17 15:34:57 UTC (rev 2382)
+++ trunk/tests/xmltester/XMLTester.cpp	2009-04-17 15:37:32 UTC (rev 2383)
@@ -760,7 +760,7 @@
 				double areatol = expectedArea / 1e3;
 
 				GeomAutoPtr gDiff = BinaryOp(gRes.get(), gRealRes.get(),
-					overlayOp(OverlayOp::opDIFFERENCE));
+					overlayOp(OverlayOp::opSYMDIFFERENCE));
 
 				double areaDiff = gDiff->getArea();
 				if ( areaDiff > areatol )
@@ -858,7 +858,7 @@
 				double areatol = expectedArea / 1e3;
 
 				GeomAutoPtr gDiff = BinaryOp(gRes.get(), gRealRes.get(),
-					overlayOp(OverlayOp::opDIFFERENCE));
+					overlayOp(OverlayOp::opSYMDIFFERENCE));
 
 				double areaDiff = gDiff->getArea();
 				if ( areaDiff > areatol )