diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-10-01 02:32:59 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-10-01 02:32:59 +0000 |
| commit | 114b7928ef6fc6036f443bd09b3f4b6e029af172 (patch) | |
| tree | 005825f3187c432e93e3ac146de690e6e46c71e9 /science | |
| parent | d3d73b2b08ce22f63cf2a89c056c9d4327d5e7be (diff) | |
| download | ports-114b7928ef6fc6036f443bd09b3f4b6e029af172.tar.gz ports-114b7928ef6fc6036f443bd09b3f4b6e029af172.zip | |
make the patch work on both -current and -stable
Notes
Notes:
svn path=/head/; revision=67274
Diffstat (limited to 'science')
| -rw-r--r-- | science/netcdf/files/patch-ncvalues.cpp | 18 | ||||
| -rw-r--r-- | science/netcdf4/files/patch-ncvalues.cpp | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/science/netcdf/files/patch-ncvalues.cpp b/science/netcdf/files/patch-ncvalues.cpp index 237cfc71b9fb..7dbb0bca2d02 100644 --- a/science/netcdf/files/patch-ncvalues.cpp +++ b/science/netcdf/files/patch-ncvalues.cpp @@ -1,19 +1,25 @@ ---- cxx/ncvalues.cpp.orig Mon Sep 16 16:28:57 2002 -+++ cxx/ncvalues.cpp Mon Sep 16 16:29:42 2002 -@@ -310,7 +310,7 @@ +--- cxx/ncvalues.cpp.orig Wed Dec 23 02:21:49 1998 ++++ cxx/ncvalues.cpp Tue Oct 1 10:27:32 2002 +@@ -310,7 +310,11 @@ os << the_values[i] << ", "; if (the_number > 0) os << the_values[the_number-1] ; -- os.flags(save); ++#if (__GNUC__ == 2) + os.flags(save); ++#else + os.flags(std::_Ios_Fmtflags(save)); ++#endif return os; } -@@ -322,6 +322,6 @@ +@@ -322,6 +326,10 @@ os << the_values[i] << ", "; if (the_number > 0) os << the_values[the_number-1]; -- os.flags(save); ++#if (__GNUC__ == 2) + os.flags(save); ++#else + os.flags(std::_Ios_Fmtflags(save)); ++#endif return os; } diff --git a/science/netcdf4/files/patch-ncvalues.cpp b/science/netcdf4/files/patch-ncvalues.cpp index 237cfc71b9fb..7dbb0bca2d02 100644 --- a/science/netcdf4/files/patch-ncvalues.cpp +++ b/science/netcdf4/files/patch-ncvalues.cpp @@ -1,19 +1,25 @@ ---- cxx/ncvalues.cpp.orig Mon Sep 16 16:28:57 2002 -+++ cxx/ncvalues.cpp Mon Sep 16 16:29:42 2002 -@@ -310,7 +310,7 @@ +--- cxx/ncvalues.cpp.orig Wed Dec 23 02:21:49 1998 ++++ cxx/ncvalues.cpp Tue Oct 1 10:27:32 2002 +@@ -310,7 +310,11 @@ os << the_values[i] << ", "; if (the_number > 0) os << the_values[the_number-1] ; -- os.flags(save); ++#if (__GNUC__ == 2) + os.flags(save); ++#else + os.flags(std::_Ios_Fmtflags(save)); ++#endif return os; } -@@ -322,6 +322,6 @@ +@@ -322,6 +326,10 @@ os << the_values[i] << ", "; if (the_number > 0) os << the_values[the_number-1]; -- os.flags(save); ++#if (__GNUC__ == 2) + os.flags(save); ++#else + os.flags(std::_Ios_Fmtflags(save)); ++#endif return os; } |