aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2002-10-01 10:32:59 +0800
committerijliao <ijliao@FreeBSD.org>2002-10-01 10:32:59 +0800
commit160ac429f3cbaa27dc096e431a3934f657eaddea (patch)
treed3e80ce9675f30de37f71de8756dff24b293dd78 /math
parentf09f32fd484e7dbdb1b0500bb574bf6561cc30ad (diff)
downloadfreebsd-ports-gnome-160ac429f3cbaa27dc096e431a3934f657eaddea.tar.gz
freebsd-ports-gnome-160ac429f3cbaa27dc096e431a3934f657eaddea.tar.zst
freebsd-ports-gnome-160ac429f3cbaa27dc096e431a3934f657eaddea.zip
make the patch work on both -current and -stable
Diffstat (limited to 'math')
-rw-r--r--math/netcdf/files/patch-ncvalues.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/math/netcdf/files/patch-ncvalues.cpp b/math/netcdf/files/patch-ncvalues.cpp
index 237cfc71b9fb..7dbb0bca2d02 100644
--- a/math/netcdf/files/patch-ncvalues.cpp
+++ b/math/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;
}