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

svn_geos at osgeo.org svn_geos at osgeo.org
Sun Feb 13 14:51:59 EST 2011


Author: mloskot
Date: 2011-02-13 11:51:59 -0800 (Sun, 13 Feb 2011)
New Revision: 3210

Modified:
   trunk/include/geos/geom/GeometryFactory.h
Log:
Return unset std::auto_otr from GeometryFactory, otherwise error condition causes no return

Modified: trunk/include/geos/geom/GeometryFactory.h
===================================================================
--- trunk/include/geos/geom/GeometryFactory.h	2011-02-13 19:50:50 UTC (rev 3209)
+++ trunk/include/geos/geom/GeometryFactory.h	2011-02-13 19:51:59 UTC (rev 3210)
@@ -354,8 +354,9 @@
     } else if ( dynamic_cast<const Point*>(*from) ) {
       return std::auto_ptr<Geometry>( createMultiPoint(fromGeoms) );
     }
+    // FIXME: Why not to throw an exception? --mloskot
     assert(0); // buildGeomtry encountered an unkwnon geometry type
- 
+    return std::auto_ptr<Geometry>(); // nullptr
   }
 
 	/** \brief



More information about the geos-commits mailing list