[geos-commits] r3373 - trunk/src/operation/overlay

[svn_geos at osgeo.org]

Author: warmerdam
Date: 2011-05-19 13:39:40 -0700 (Thu, 19 May 2011)
New Revision: 3373

Modified:
   trunk/src/operation/overlay/PolygonBuilder.cpp
Log:
shellCount checking should not be DEBUG only now that we throw an exception (#398)

Modified: trunk/src/operation/overlay/PolygonBuilder.cpp
===================================================================
--- trunk/src/operation/overlay/PolygonBuilder.cpp	2011-05-19 19:32:06 UTC (rev 3372)
+++ trunk/src/operation/overlay/PolygonBuilder.cpp	2011-05-19 20:39:40 UTC (rev 3373)
@@ -224,9 +224,7 @@
 EdgeRing*
 PolygonBuilder::findShell(vector<MinimalEdgeRing*> *minEdgeRings)
 {
-#ifndef NDEBUG
 	int shellCount=0;
-#endif
 	EdgeRing *shell=NULL;
 
 #if GEOS_DEBUG
@@ -239,17 +237,13 @@
 		if ( ! er->isHole() )
 		{
 			shell=er;
-#ifndef NDEBUG
 			++shellCount;
-#endif
 		}
 	}
 
-#ifndef NDEBUG
 	if ( shellCount > 1 ) {
 		throw util::TopologyException("found two shells in MinimalEdgeRing list");
 	}
-#endif
 
 	return shell;
 }