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

[svn_geos at osgeo.org]

Author: mloskot
Date: 2011-02-13 11:54:01 -0800 (Sun, 13 Feb 2011)
New Revision: 3211

Modified:
   trunk/include/geos/geom/MultiLineString.h
   trunk/include/geos/geom/MultiPoint.h
   trunk/include/geos/geom/MultiPolygon.h
Log:
Explicitly disabled Visual C++ warning C4250 ('class1' : inherits 'class2::member' via dominance) - it is still unclear if caused by Visual C++ bug https://connect.microsoft.com/VisualStudio/feedback/details/101259/ - safe to disable anyway.

Modified: trunk/include/geos/geom/MultiLineString.h
===================================================================
--- trunk/include/geos/geom/MultiLineString.h	2011-02-13 19:51:59 UTC (rev 3210)
+++ trunk/include/geos/geom/MultiLineString.h	2011-02-13 19:54:01 UTC (rev 3211)
@@ -43,6 +43,11 @@
 namespace geos {
 namespace geom { // geos::geom
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4250) // T1 inherits T2 via dominance
+#endif
+
 /// Models a collection of (@link LineString}s.
 class GEOS_DLL MultiLineString: public GeometryCollection, public Lineal {
 
@@ -113,6 +118,10 @@
 	MultiLineString(const MultiLineString &mp);
 };
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 } // namespace geos::geom
 } // namespace geos
 

Modified: trunk/include/geos/geom/MultiPoint.h
===================================================================
--- trunk/include/geos/geom/MultiPoint.h	2011-02-13 19:51:59 UTC (rev 3210)
+++ trunk/include/geos/geom/MultiPoint.h	2011-02-13 19:54:01 UTC (rev 3211)
@@ -43,6 +43,11 @@
 namespace geos {
 namespace geom { // geos::geom
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4250) // T1 inherits T2 via dominance
+#endif
+
 /**
  * Models a collection of Point objects.
  *
@@ -109,6 +114,10 @@
 	const Coordinate* getCoordinateN(int n) const;
 };
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 } // namespace geos::geom
 } // namespace geos
 

Modified: trunk/include/geos/geom/MultiPolygon.h
===================================================================
--- trunk/include/geos/geom/MultiPolygon.h	2011-02-13 19:51:59 UTC (rev 3210)
+++ trunk/include/geos/geom/MultiPolygon.h	2011-02-13 19:54:01 UTC (rev 3211)
@@ -45,6 +45,11 @@
 namespace geos {
 namespace geom { // geos::geom
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4250) // T1 inherits T2 via dominance
+#endif
+
 /// Models a collection of {@link Polygon}s.
 //
 /// As per the OGC SFS specification,
@@ -55,7 +60,6 @@
 ///
 class GEOS_DLL MultiPolygon: public GeometryCollection, public Polygonal
 {
-
 public:
 
 	friend class GeometryFactory;
@@ -112,10 +116,11 @@
 	MultiPolygon(std::vector<Geometry *> *newPolys, const GeometryFactory *newFactory);
 
 	MultiPolygon(const MultiPolygon &mp);
-
-
 };
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 } // namespace geos::geom
 } // namespace geos