[geos-commits] r3207 - trunk/include/geos/geom

[svn_geos at osgeo.org]

Author: mloskot
Date: 2011-02-13 11:22:24 -0800 (Sun, 13 Feb 2011)
New Revision: 3207

Modified:
   trunk/include/geos/geom/BinaryOp.h
Log:
Fixed missing or ambiguous declarations of TopologyException (Ticket #394)

Modified: trunk/include/geos/geom/BinaryOp.h
===================================================================
--- trunk/include/geos/geom/BinaryOp.h	2011-02-12 08:54:02 UTC (rev 3206)
+++ trunk/include/geos/geom/BinaryOp.h	2011-02-13 19:22:24 UTC (rev 3207)
@@ -238,7 +238,7 @@
 	typedef std::auto_ptr<Geometry> GeomPtr;
 
 	GeomPtr ret;
-	util::TopologyException origException;
+	geos::util::TopologyException origException;
 
 #ifdef USE_ORIGINAL_INPUT
 	// Try with original input
@@ -250,7 +250,7 @@
 		ret.reset(_Op(g0, g1));
 		return ret;
 	}
-	catch (const util::TopologyException& ex)
+	catch (const geos::util::TopologyException& ex)
 	{
 		origException=ex;
 #if GEOS_DEBUG_BINARYOP
@@ -306,12 +306,11 @@
 		// reshift to orginal precision (see EnhancedPrecisionOp)
 		using operation::valid::IsValidOp;
 		using operation::valid::TopologyValidationError;
-		using util::TopologyException;
 		IsValidOp ivo(ret.get());
 		if ( ! ivo.isValid() )
 		{
 			TopologyValidationError* e = ivo.getValidationError();
-			throw TopologyException(
+			throw geos::util::TopologyException(
 				"Result of overlay became invalid "
 				"after re-addin common bits of operand "
 				"coordinates: " + e->toString(),
@@ -321,7 +320,7 @@
 
 		return ret;
 	}
-	catch (const util::TopologyException& ex)
+	catch (const geos::util::TopologyException& ex)
 	{
         ::geos::ignore_unused_variable_warning(ex);
 #if GEOS_DEBUG_BINARYOP
@@ -351,7 +350,7 @@
 		return ret;
 		
 	}
-	catch (const util::TopologyException& ex)
+	catch (const geos::util::TopologyException& ex)
 	{
         ::geos::ignore_unused_variable_warning(ex);
 #if GEOS_DEBUG_BINARYOP
@@ -388,7 +387,7 @@
 				ret.reset( _Op(rG0.get(), rG1.get()) );
 				return ret;
 			}
-			catch (const util::TopologyException& ex)
+			catch (const geos::util::TopologyException& ex)
 			{
 				if ( precision == 1 ) throw ex;
 #if GEOS_DEBUG_BINARYOP
@@ -400,7 +399,7 @@
 		}
 
 	}
-	catch (const util::TopologyException& ex)
+	catch (const geos::util::TopologyException& ex)
 	{
 #if GEOS_DEBUG_BINARYOP
 		std::cerr << "Reduced: " << ex.what() << std::endl;
@@ -435,7 +434,7 @@
 				ret.reset( _Op(rG0.get(), rG1.get()) );
 				return ret;
 			}
-			catch (const util::TopologyException& ex)
+			catch (const geos::util::TopologyException& ex)
 			{
 				if ( tol >= maxTolerance ) throw ex;
 #if GEOS_DEBUG_BINARYOP
@@ -449,7 +448,7 @@
 		return ret;
 
 	}
-	catch (const util::TopologyException& ex)
+	catch (const geos::util::TopologyException& ex)
 	{
 #if GEOS_DEBUG_BINARYOP
 		std::cerr << "Simplified: " << ex.what() << std::endl;