[geos-commits] r2717 - in trunk: . capi

svn_geos at osgeo.org svn_geos at osgeo.org
Tue Nov 17 20:28:35 EST 2009


Author: mloskot
Date: 2009-11-17 20:28:33 -0500 (Tue, 17 Nov 2009)
New Revision: 2717

Modified:
   trunk/ChangeLog
   trunk/capi/geos_c.cpp
   trunk/capi/geos_ts_c.cpp
Log:
Silent warning thrown by Visual C++ about mixed class and struct keyword (#269)

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-17 20:29:02 UTC (rev 2716)
+++ trunk/ChangeLog	2009-11-18 01:28:33 UTC (rev 2717)
@@ -1,3 +1,8 @@
+2009-11-18 01:26  Mateusz Loskot <mateusz at loskot.net>
+
+	* [r2717] capi/geos_c.cpp, capi/geos_ts_c.cpp: Silent warning
+    thrown by Visual C++ about mixed class and struct keyword (#269)
+
 2009-10-29 21:06  Mateusz Loskot <mateusz at loskot.net>
 
 	* [r2710] tests/unit/operation/buffer/BufferOpTest.cpp: Testing

Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp	2009-11-17 20:29:02 UTC (rev 2716)
+++ trunk/capi/geos_c.cpp	2009-11-18 01:28:33 UTC (rev 2717)
@@ -26,6 +26,10 @@
 #include <geos/operation/union/CascadedPolygonUnion.h>
 #include <geos/algorithm/distance/DiscreteHausdorffDistance.h>
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4099)
+#endif
+
 // Some extra magic to make type declarations in geos_c.h work - for cross-checking of types in header.
 #define GEOSGeometry geos::geom::Geometry
 #define GEOSPreparedGeometry geos::geom::prep::PreparedGeometry

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2009-11-17 20:29:02 UTC (rev 2716)
+++ trunk/capi/geos_ts_c.cpp	2009-11-18 01:28:33 UTC (rev 2717)
@@ -66,6 +66,10 @@
 #include <string>
 #include <memory>
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4099)
+#endif
+
 // Some extra magic to make type declarations in geos_c.h work - 
 // for cross-checking of types in header.
 #define GEOSGeometry geos::geom::Geometry



More information about the geos-commits mailing list