diff options
author | rtr <rtr@pkgsrc.org> | 2003-10-26 14:05:59 +0000 |
---|---|---|
committer | rtr <rtr@pkgsrc.org> | 2003-10-26 14:05:59 +0000 |
commit | 06d5ca37ff6df865f2720ef8b33690653366075f (patch) | |
tree | a4514179f9655974f374814b7eb026e1aad9b945 /devel/netcdf/patches | |
parent | a353ec221d2a869209f4bb97a48249575904533c (diff) | |
download | pkgsrc-06d5ca37ff6df865f2720ef8b33690653366075f.tar.gz |
Additional patches resolve gcc3 issues in cpp code & conf macro.
Approved by jlam@netbsd.org
Diffstat (limited to 'devel/netcdf/patches')
-rw-r--r-- | devel/netcdf/patches/patch-aj | 14 | ||||
-rw-r--r-- | devel/netcdf/patches/patch-ak | 29 |
2 files changed, 43 insertions, 0 deletions
diff --git a/devel/netcdf/patches/patch-aj b/devel/netcdf/patches/patch-aj new file mode 100644 index 00000000000..63c17945567 --- /dev/null +++ b/devel/netcdf/patches/patch-aj @@ -0,0 +1,14 @@ +--- configure.orig 2003-10-26 08:17:58.000000000 +1100 ++++ configure 2003-10-26 08:18:12.000000000 +1100 +@@ -1232,9 +1232,9 @@ + extern "C" void exit(int); + #endif + +- #include <iostream.h> ++ #include <iostream> + int main() { +- cout << ""; ++ std::cout << ""; + return 0; + } + diff --git a/devel/netcdf/patches/patch-ak b/devel/netcdf/patches/patch-ak new file mode 100644 index 00000000000..4022ff26a2f --- /dev/null +++ b/devel/netcdf/patches/patch-ak @@ -0,0 +1,29 @@ +--- cxx/netcdfcpp.h.orig 2003-10-26 08:25:59.000000000 +1100 ++++ cxx/netcdfcpp.h 2003-10-26 08:26:58.000000000 +1100 +@@ -154,7 +154,7 @@ + virtual ~NcDim( void ); + + // to construct dimensions, since constructor is private +- friend NcFile; ++ friend class NcFile; + }; + + +@@ -357,7 +357,7 @@ + void init_cur( void ); + + // to make variables, since constructor is private +- friend NcFile; ++ friend class NcFile; + }; + + +@@ -388,7 +388,7 @@ + NcAtt( NcFile*, NcToken); // global attribute + + // To make attributes, since constructor is private +- friend NcFile; ++ friend class NcFile; + friend NcAtt* NcVar::get_att( NcToken ) const; + }; + |