diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-16 08:35:18 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-16 08:35:18 +0000 |
commit | 200cc843b1c92b2ae48ee266d0aab94fd73819f6 (patch) | |
tree | 4e05de32678a571d50f22955d33983f006dbedf5 /math/netcdf | |
parent | add metalog 0.7b (diff) |
fix build on -current
Notes
Notes:
svn path=/head/; revision=66423
Diffstat (limited to 'math/netcdf')
-rw-r--r-- | math/netcdf/files/patch-ncvalues.cpp | 19 | ||||
-rw-r--r-- | math/netcdf/files/patch-netcdfcpp.h | 29 |
2 files changed, 48 insertions, 0 deletions
diff --git a/math/netcdf/files/patch-ncvalues.cpp b/math/netcdf/files/patch-ncvalues.cpp new file mode 100644 index 000000000000..db23497f18b8 --- /dev/null +++ b/math/netcdf/files/patch-ncvalues.cpp @@ -0,0 +1,19 @@ +--- src/cxx/ncvalues.cpp.orig Mon Sep 16 16:28:57 2002 ++++ src/cxx/ncvalues.cpp Mon Sep 16 16:29:42 2002 +@@ -310,7 +310,7 @@ + os << the_values[i] << ", "; + if (the_number > 0) + os << the_values[the_number-1] ; +- os.flags(save); ++ os.flags(std::_Ios_Fmtflags(save)); + return os; + } + +@@ -322,6 +322,6 @@ + os << the_values[i] << ", "; + if (the_number > 0) + os << the_values[the_number-1]; +- os.flags(save); ++ os.flags(std::_Ios_Fmtflags(save)); + return os; + } diff --git a/math/netcdf/files/patch-netcdfcpp.h b/math/netcdf/files/patch-netcdfcpp.h new file mode 100644 index 000000000000..3260c296bd07 --- /dev/null +++ b/math/netcdf/files/patch-netcdfcpp.h @@ -0,0 +1,29 @@ +--- src/cxx/netcdfcpp.h.orig Mon Sep 16 16:25:44 2002 ++++ src/cxx/netcdfcpp.h Mon Sep 16 16:26:23 2002 +@@ -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; + }; + |