[geos-commits] r2754 - in trunk: build/msvc90/geos_c_dll build/msvc90/geos_lib build/msvc90/geos_unit build/msvc90/geos_xmltester source/geom source/headers/geos/simplify source/io source/linearref

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-11-30 08:55:12 -0500 (Mon, 30 Nov 2009)
New Revision: 2754

Modified:
   trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj
   trunk/build/msvc90/geos_lib/geos_lib.vcproj
   trunk/build/msvc90/geos_unit/geos_unit.vcproj
   trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj
   trunk/source/geom/GeometryCollection.cpp
   trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h
   trunk/source/io/WKTReader.cpp
   trunk/source/linearref/ExtractLineByLocation.cpp
Log:
* Fixed incomplete types Geometry and TaggedLinesSimplifier in TopologyPreservingSimplifier.h - required by std::auto_ptr
* Removed unreachable code.
* Removed /Wp64 option from Visual Studio 2008 projects.


Modified: trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj
===================================================================
--- trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/build/msvc90/geos_c_dll/geos_c_dll.vcproj	2009-11-30 13:55:12 UTC (rev 2754)
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -123,7 +123,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool

Modified: trunk/build/msvc90/geos_lib/geos_lib.vcproj
===================================================================
--- trunk/build/msvc90/geos_lib/geos_lib.vcproj	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/build/msvc90/geos_lib/geos_lib.vcproj	2009-11-30 13:55:12 UTC (rev 2754)
@@ -51,7 +51,7 @@
 				UsePrecompiledHeader="0"
 				BrowseInformation="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -113,7 +113,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool

Modified: trunk/build/msvc90/geos_unit/geos_unit.vcproj
===================================================================
--- trunk/build/msvc90/geos_unit/geos_unit.vcproj	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/build/msvc90/geos_unit/geos_unit.vcproj	2009-11-30 13:55:12 UTC (rev 2754)
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -125,7 +125,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool

Modified: trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj
===================================================================
--- trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj	2009-11-30 13:55:12 UTC (rev 2754)
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -124,7 +124,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool

Modified: trunk/source/geom/GeometryCollection.cpp
===================================================================
--- trunk/source/geom/GeometryCollection.cpp	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/source/geom/GeometryCollection.cpp	2009-11-30 13:55:12 UTC (rev 2754)
@@ -160,9 +160,6 @@
 GeometryCollection::getBoundary() const
 {
 	throw util::IllegalArgumentException("Operation not supported by GeometryCollection\n");
-	checkNotGeometryCollection(this);
-	abort(); // never reached...
-	return false;
 }
 
 bool

Modified: trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h	2009-11-30 13:55:12 UTC (rev 2754)
@@ -25,20 +25,12 @@
 #define _GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H_ 
 
 #include <geos/export.h>
+#include <geos/geom/Geometry.h>
+#include <geos/simplify/TaggedLinesSimplifier.h>
 #include <memory> // for auto_ptr
 #include <map> 
 
-// Forward declarations
 namespace geos {
-	namespace simplify {
-		class TaggedLinesSimplifier;
-	}
-	namespace geom {
-		class Geometry;
-	}
-}
-
-namespace geos {
 namespace simplify { // geos::simplify
 
 /** \brief

Modified: trunk/source/io/WKTReader.cpp
===================================================================
--- trunk/source/io/WKTReader.cpp	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/source/io/WKTReader.cpp	2009-11-30 13:55:12 UTC (rev 2754)
@@ -332,7 +332,6 @@
 		}
 		err << endl;
 		throw ParseException(err.str());
-		return NULL;
 	}
 }
 

Modified: trunk/source/linearref/ExtractLineByLocation.cpp
===================================================================
--- trunk/source/linearref/ExtractLineByLocation.cpp	2009-11-30 12:25:26 UTC (rev 2753)
+++ trunk/source/linearref/ExtractLineByLocation.cpp	2009-11-30 13:55:12 UTC (rev 2754)
@@ -81,6 +81,7 @@
 		else
 		{
 			assert(!"non-linear geometry encountered");
+            return 0;
 		}
 	}
 }