Commit bff56668 authored by Dan Baston's avatar Dan Baston

Remove nullptr for C++98

parent 35906587
Pipeline #31049903 passed with stage
in 17 minutes and 39 seconds
//
//
// 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"));
}
......
//
//
// 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");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment