SF.net SVN: matplotlib:[5925] trunk/toolkits/basemap

[<js...@us...>]

Revision: 5925
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5925&view=rev
Author:   jswhit
Date:     2008-07-29 19:59:43 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
gcc4.3 compatibility patch for geos-2.2.3 from David Huard.

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/README
    trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp
    trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/Changelog	2008-07-29 19:59:43 UTC (rev 5925)
@@ -1,4 +1,5 @@
 version 0.99.1 (not yet released)
+           * geos-2.2.3 patched for compatibility with gcc 4.3.
            * added "barbs" method to draw wind barbs on the map.
            * added "tissot" method for generating Tissot's indicatrix
              (see example plot_tissot.py).

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/README	2008-07-29 19:59:43 UTC (rev 5925)
@@ -125,5 +125,7 @@
 Erik Andersen
 Michael Hearne
 Jesper Larsen
+Ryan May
+David Huard
 
 for valuable contributions.

Modified: trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/capi/geos_c.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -18,6 +18,7 @@
 #include <stdio.h>
 
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <fstream>

Modified: trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/index/quadtree/DoubleBits.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -15,6 +15,7 @@
 
 #include <geos/indexQuadtree.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 

Modified: trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/io/ByteOrderValues.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -16,6 +16,7 @@
 
 #include <geos/io.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 

Modified: trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp
===================================================================
--- trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp	2008-07-29 18:34:11 UTC (rev 5924)
+++ trunk/toolkits/basemap/geos-2.2.3/source/io/StringTokenizer.cpp	2008-07-29 19:59:43 UTC (rev 5925)
@@ -36,7 +36,9 @@
 
 
 #include <geos/io.h>
+#include <cstring>
 
+
 namespace geos {
 
 StringTokenizer::StringTokenizer(){


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