[geos-commits] [SCM] GEOS branch svn-3.6 updated. bff56668fda7958634413d223bef199da24d6110

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, svn-3.6 has been updated
       via  bff56668fda7958634413d223bef199da24d6110 (commit)
      from  35906587bfe4ee83a3f406801d98c3c34b533589 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bff56668fda7958634413d223bef199da24d6110
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Sep 24 10:47:36 2018 -0400

    Remove nullptr for C++98

diff --git a/tests/unit/capi/GEOSUnaryUnionTest.cpp b/tests/unit/capi/GEOSUnaryUnionTest.cpp
index 0f7705d..1fb8c01 100644
--- a/tests/unit/capi/GEOSUnaryUnionTest.cpp
+++ b/tests/unit/capi/GEOSUnaryUnionTest.cpp
@@ -1,4 +1,4 @@
-// 
+//
 // Test Suite for C-API GEOSUnaryUnion
 
 #include <tut.hpp>
@@ -31,7 +31,7 @@ namespace tut
             va_start(ap, fmt);
             std::vfprintf(stdout, fmt, ap);
             va_end(ap);
-        
+
             std::fprintf(stdout, "\n");
         }
 
@@ -42,7 +42,7 @@ namespace tut
             wktw_ = GEOSWKTWriter_create();
             GEOSWKTWriter_setTrim(wktw_, 1);
             GEOSWKTWriter_setOutputDimension(wktw_, 3);
-        }       
+        }
 
         std::string toWKT(GEOSGeometry* g)
         {
@@ -213,10 +213,10 @@ namespace tut
     void object::test<10>()
     {
         geom1_ = GEOSGeomFromWKT("LINESTRING EMPTY");
-        ensure( nullptr != geom1_ );
+        ensure( 0 != geom1_ );
 
         geom2_ = GEOSUnaryUnion(geom1_);
-        ensure( nullptr != geom2_ );
+        ensure( 0 != geom2_ );
 
         ensure_equals(toWKT(geom2_), std::string("GEOMETRYCOLLECTION EMPTY"));
     }
diff --git a/tests/unit/operation/union/UnaryUnionOpTest.cpp b/tests/unit/operation/union/UnaryUnionOpTest.cpp
index 1e14a66..7e9f296 100644
--- a/tests/unit/operation/union/UnaryUnionOpTest.cpp
+++ b/tests/unit/operation/union/UnaryUnionOpTest.cpp
@@ -1,4 +1,4 @@
-// 
+//
 // Test Suite for geos::operation::geounion::UnaryUnionOp class.
 
 // tut
@@ -137,7 +137,7 @@ namespace tut
     template<>
     void object::test<4>()
     {
-        static char const* const geoms[] = 
+        static char const* const geoms[] =
         {
             "POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0))",
             "MULTIPOLYGON (((20 0, 20 10, 40 10, 40 0, 20 0)),((5 5, 5 8, 8 8, 8 5, 5 5)))",
@@ -155,7 +155,7 @@ namespace tut
     template<>
     void object::test<5>()
     {
-        static char const* const geoms[] = 
+        static char const* const geoms[] =
         {
             "LINESTRING (40 60, 120 110)",
             "POINT (120 110)",
@@ -171,7 +171,7 @@ namespace tut
     template<>
     void object::test<6>()
     {
-        static char const* const geoms[] = 
+        static char const* const geoms[] =
         {
             "LINESTRING (0 0, 10 0, 5 -5, 5 5)",
             NULL
@@ -186,7 +186,7 @@ namespace tut
         static char const* const geoms[] =
         {
             "LINESTRING EMPTY",
-            nullptr
+            NULL
         };
         doTest(geoms, "GEOMETRYCOLLECTION EMPTY");
     }

-----------------------------------------------------------------------

Summary of changes:
 tests/unit/capi/GEOSUnaryUnionTest.cpp          | 10 +++++-----
 tests/unit/operation/union/UnaryUnionOpTest.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GEOS