[geos-commits] r2616 - in trunk/source: headers/geos/io io

[svn_geos at osgeo.org]

Author: pramsey
Date: 2009-07-17 18:23:41 -0400 (Fri, 17 Jul 2009)
New Revision: 2616

Modified:
   trunk/source/headers/geos/io/WKBReader.h
   trunk/source/io/WKBReader.cpp
Log:
Remove static string in WKB reader (#232)


Modified: trunk/source/headers/geos/io/WKBReader.h
===================================================================
--- trunk/source/headers/geos/io/WKBReader.h	2009-07-17 22:23:03 UTC (rev 2615)
+++ trunk/source/headers/geos/io/WKBReader.h	2009-07-17 22:23:41 UTC (rev 2616)
@@ -30,6 +30,9 @@
 #include <vector>
 #include <string>
 
+#define BAD_GEOM_TYPE_MSG "Bad geometry type encountered in"
+
+
 // Forward declarations
 namespace geos {
 	namespace geom {
@@ -111,8 +114,6 @@
  
 private:
 
-	static std::string BAD_GEOM_TYPE_MSG;
-
 	const geom::GeometryFactory &factory;
 
 	// for now support the WKB standard only - may be generalized later

Modified: trunk/source/io/WKBReader.cpp
===================================================================
--- trunk/source/io/WKBReader.cpp	2009-07-17 22:23:03 UTC (rev 2615)
+++ trunk/source/io/WKBReader.cpp	2009-07-17 22:23:41 UTC (rev 2616)
@@ -47,8 +47,6 @@
 namespace geos {
 namespace io { // geos.io
 
-string WKBReader::BAD_GEOM_TYPE_MSG = "bad geometry type encountered in ";
-
 WKBReader::WKBReader()
 	:
 	factory(*(GeometryFactory::getDefaultInstance()))