[csw-devel] SF.net SVN: gar:[17816] csw/mgar/pkg/geos/trunk

[bdwalton at users.sourceforge.net]

Revision: 17816
          http://gar.svn.sourceforge.net/gar/?rev=17816&view=rev
Author:   bdwalton
Date:     2012-04-23 00:42:08 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
geos/trunk: use a real hack of a patch to fix isnan use in the test suite that breaks with the fix for the main code body

Modified Paths:
--------------
    csw/mgar/pkg/geos/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch

Modified: csw/mgar/pkg/geos/trunk/Makefile
===================================================================
--- csw/mgar/pkg/geos/trunk/Makefile	2012-04-22 17:27:35 UTC (rev 17815)
+++ csw/mgar/pkg/geos/trunk/Makefile	2012-04-23 00:42:08 UTC (rev 17816)
@@ -14,6 +14,7 @@
 MASTER_SITES = http://download.osgeo.org/$(NAME)/
 DISTFILES  = $(DISTNAME).tar.bz2
 PATCHFILES += 0001-use-namespace-std-on-isnan-when-building-on-solaris-.patch
+PATCHFILES += 0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch
 
 GARCOMPILER = GNU
 

Added: csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch
===================================================================
--- csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch	                        (rev 0)
+++ csw/mgar/pkg/geos/trunk/files/0002-drop-use-of-macro-in-test-suite-that-conflicts-with-.patch	2012-04-23 00:42:08 UTC (rev 17816)
@@ -0,0 +1,50 @@
+From d4f1d807146bfe7c406fd3cc30e59f9e7e4c52a0 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 22 Apr 2012 03:24:14 +0200
+Subject: [PATCH] drop use of macro in test suite that conflicts with required
+ change for real code (a bad hack, yes)
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ tests/unit/geom/CoordinateArraySequenceTest.cpp |    2 +-
+ tests/unit/io/WKBWriterTest.cpp                 |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/unit/geom/CoordinateArraySequenceTest.cpp b/tests/unit/geom/CoordinateArraySequenceTest.cpp
+index e46f102..67b666a 100644
+--- a/tests/unit/geom/CoordinateArraySequenceTest.cpp
++++ b/tests/unit/geom/CoordinateArraySequenceTest.cpp
+@@ -30,7 +30,7 @@ namespace tut
+           Filter() : is3d(false) {}
+           void filter_rw(geos::geom::Coordinate* c) const {
+             if ( is3d ) {
+-              if ( ISNAN(c->z) ) c->z = 0.0;
++              if ( __builtin_isnan(c->z) ) c->z = 0.0;
+             }
+             else c->z = DoubleNotANumber;
+           }
+diff --git a/tests/unit/io/WKBWriterTest.cpp b/tests/unit/io/WKBWriterTest.cpp
+index 13f158f..43c0318 100644
+--- a/tests/unit/io/WKBWriterTest.cpp
++++ b/tests/unit/io/WKBWriterTest.cpp
+@@ -76,7 +76,7 @@ namespace tut
+             ensure( geom->getCoordinateDimension() == 2 );
+             ensure( geom->getCoordinate()->x == -117.0 );
+             ensure( geom->getCoordinate()->y == 33.0 );
+-            ensure( ISNAN(geom->getCoordinate()->z) != 0 );
++            ensure( __builtin_isnan(geom->getCoordinate()->z) != 0 );
+ 
+             delete geom;
+     }
+@@ -128,7 +128,7 @@ namespace tut
+             ensure( geom->getCoordinateDimension() == 2 );
+             ensure( geom->getCoordinate()->x == -117.0 );
+             ensure( geom->getCoordinate()->y == 33.0 );
+-            ensure( ISNAN(geom->getCoordinate()->z) != 0);
++            ensure( __builtin_isnan(geom->getCoordinate()->z) != 0);
+ 
+             delete geom;
+     }
+-- 
+1.7.10
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.