- up to 1.6.1

[packages/gdal.git] / gdal-dods.patch

diff --git a/gdal-dods.patch b/gdal-dods.patch
index c836503491e16f006d44a4a9a47292955e70d841..e15916c852d0d9841e9af6af07922c342e83f66e 100644 (file)
--- a/gdal-dods.patch
+++ b/gdal-dods.patch
@@ -12,3 +12,25 @@
      else
        dnl Otherwise try to put things together in a more primitive way.
        LIBS="$LIBS -L$DODS_LIB -ldap++ -lpthread -lrx"
+--- gdal-1.6.1/frmts/dods/dodsdataset2.cpp~    2008-08-22 19:39:47.000000000 +0200
++++ gdal-1.6.1/frmts/dods/dodsdataset2.cpp     2009-07-14 15:08:02.545973283 +0200
+@@ -61,8 +61,6 @@
+ #include "ogr_spatialref.h"
+ #include "cpl_string.h"
+ 
+-using namespace libdap;
+-
+ CPL_CVSID("$Id$");
+ 
+ CPL_C_START
+--- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogr_dods.h~        2008-10-23 02:04:33.000000000 +0200
++++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogr_dods.h 2009-07-14 15:17:51.012634019 +0200
+@@ -68,8 +68,6 @@
+ #include <Error.h>
+ #include <escaping.h>
+ 
+-using namespace libdap;
+-
+ /************************************************************************/
+ /*                           OGRDODSFieldDefn                           */
+ /************************************************************************/