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

[Mateusz Loskot]

Author: mloskot
Date: 2017-03-20 16:53:52 -0700 (Mon, 20 Mar 2017)
New Revision: 4350

Modified:
   trunk/include/geos/geom/Lineal.h
   trunk/include/geos/geom/Polygonal.h
   trunk/include/geos/geom/Puntal.h
Log:
Disable false warning C4589 : Constructor of abstract class A ignores initializer for virtual base class B
(Details at https://connect.microsoft.com/VisualStudio/feedback/details/1581706/false-warning-c4589-constructor-of-abstract-class-class2-ignores-initializer-for-virtual-base-class-class1)

Modified: trunk/include/geos/geom/Lineal.h
===================================================================
--- trunk/include/geos/geom/Lineal.h	2017-03-20 23:48:46 UTC (rev 4349)
+++ trunk/include/geos/geom/Lineal.h	2017-03-20 23:53:52 UTC (rev 4350)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -22,6 +22,11 @@
 #include <geos/export.h>
 #include <geos/geom/Geometry.h> // for inheritance
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4589) // warning C4589 : Constructor of abstract class 'Lineal' ignores initializer for virtual base class 'Geometry'
+#endif
+
 namespace geos {
 namespace geom { // geos::geom
 
@@ -38,4 +43,8 @@
 } // namespace geos::geom
 } // namespace geos
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // ndef GEOS_GEOM_LINEAL_H

Modified: trunk/include/geos/geom/Polygonal.h
===================================================================
--- trunk/include/geos/geom/Polygonal.h	2017-03-20 23:48:46 UTC (rev 4349)
+++ trunk/include/geos/geom/Polygonal.h	2017-03-20 23:53:52 UTC (rev 4350)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -22,6 +22,11 @@
 #include <geos/export.h>
 #include <geos/geom/Geometry.h> // for inheritance
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4589) // warning C4589 : Constructor of abstract class 'Puntal' ignores initializer for virtual base class 'Geometry'
+#endif
+
 namespace geos {
 namespace geom { // geos::geom
 
@@ -38,4 +43,8 @@
 } // namespace geos::geom
 } // namespace geos
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // ndef GEOS_GEOM_POLYGONAL_H

Modified: trunk/include/geos/geom/Puntal.h
===================================================================
--- trunk/include/geos/geom/Puntal.h	2017-03-20 23:48:46 UTC (rev 4349)
+++ trunk/include/geos/geom/Puntal.h	2017-03-20 23:53:52 UTC (rev 4350)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -22,6 +22,11 @@
 #include <geos/export.h>
 #include <geos/geom/Geometry.h> // for inheritance
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4589) // warning C4589 : Constructor of abstract class 'Puntal' ignores initializer for virtual base class 'Geometry'
+#endif
+
 namespace geos {
 namespace geom { // geos::geom
 
@@ -38,4 +43,8 @@
 } // namespace geos::geom
 } // namespace geos
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // ndef GEOS_GEOM_PUNTAL_H