Mercurial > forge
changeset 12565:f22c1e4bc9c5 octave-forge
Fix for compiling with octave 4.0.0-rc1
| author | abarth93 |
|---|---|
| date | Tue, 10 Mar 2015 13:53:33 +0000 |
| parents | c73c23bbe9ce |
| children | 1d0ab462926e |
| files | main/octcdf/DESCRIPTION main/octcdf/NEWS main/octcdf/src/ov-ncatt.cc main/octcdf/src/ov-ncatt.h main/octcdf/src/ov-ncdim.cc main/octcdf/src/ov-ncdim.h main/octcdf/src/ov-ncfile.cc main/octcdf/src/ov-ncfile.h main/octcdf/src/ov-ncvar.cc main/octcdf/src/ov-ncvar.h |
| diffstat | 10 files changed, 21 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/main/octcdf/DESCRIPTION Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/DESCRIPTION Tue Mar 10 13:53:33 2015 +0000 @@ -1,6 +1,6 @@ Name: octcdf -Version: 1.1.7 -Date: 2014-02-17 +Version: 1.1.8 +Date: 2015-03-10 Author: Alexander Barth <barth.alexander@gmail.com> Maintainer: Alexander Barth <barth.alexander@gmail.com> Title: octcdf
--- a/main/octcdf/NEWS Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/NEWS Tue Mar 10 13:53:33 2015 +0000 @@ -1,11 +1,12 @@ Summary of important user-visible changes for releases of the octcdf package =============================================================================== -octcdf-1.1.8 Release Date: 2014-xx-xx Release Manager: Alexander Barth +octcdf-1.1.8 Release Date: 2015-03-10 Release Manager: Alexander Barth =============================================================================== ** Add depreciation info. Please use the netcdf package instead (possibly in combination with ncarray). + ** Fix for compiling with octave 4.0.0-rc1 =============================================================================== octcdf-1.1.7 Release Date: 2014-02-17 Release Manager: Alexander Barth
--- a/main/octcdf/src/ov-ncatt.cc Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncatt.cc Tue Mar 10 13:53:33 2015 +0000 @@ -249,8 +249,9 @@ set_name(new_name); } - +#ifdef DEFINE_OCTAVE_ALLOCATOR DEFINE_OCTAVE_ALLOCATOR(octave_ncatt); +#endif DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncatt, "ncatt", "ncatt");
--- a/main/octcdf/src/ov-ncatt.h Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncatt.h Tue Mar 10 13:53:33 2015 +0000 @@ -143,8 +143,9 @@ private: ncatt_t* nca; - +#ifdef DEFINE_OCTAVE_ALLOCATOR DECLARE_OCTAVE_ALLOCATOR +#endif DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/main/octcdf/src/ov-ncdim.cc Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncdim.cc Tue Mar 10 13:53:33 2015 +0000 @@ -134,8 +134,9 @@ set_name(new_name); } - +#ifdef DEFINE_OCTAVE_ALLOCATOR DEFINE_OCTAVE_ALLOCATOR(octave_ncdim); +#endif DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncdim, "ncdim", "ncdim");
--- a/main/octcdf/src/ov-ncdim.h Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncdim.h Tue Mar 10 13:53:33 2015 +0000 @@ -134,8 +134,9 @@ private: ncdim_t* ncd; - +#ifdef DEFINE_OCTAVE_ALLOCATOR DECLARE_OCTAVE_ALLOCATOR +#endif DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/main/octcdf/src/ov-ncfile.cc Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncfile.cc Tue Mar 10 13:53:33 2015 +0000 @@ -478,8 +478,10 @@ +#ifdef DEFINE_OCTAVE_ALLOCATOR +DEFINE_OCTAVE_ALLOCATOR(octave_ncfile) +#endif -DEFINE_OCTAVE_ALLOCATOR(octave_ncfile); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncfile, "ncfile", "ncfile");
--- a/main/octcdf/src/ov-ncfile.h Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncfile.h Tue Mar 10 13:53:33 2015 +0000 @@ -105,8 +105,9 @@ private: ncfile_t* nf; - +#ifdef DEFINE_OCTAVE_ALLOCATOR DECLARE_OCTAVE_ALLOCATOR +#endif DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/main/octcdf/src/ov-ncvar.cc Tue Feb 24 10:12:25 2015 +0000 +++ b/main/octcdf/src/ov-ncvar.cc Tue Mar 10 13:53:33 2015 +0000 @@ -530,7 +530,9 @@ set_varname(new_name); } +#ifdef DEFINE_OCTAVE_ALLOCATOR DEFINE_OCTAVE_ALLOCATOR(octave_ncvar); +#endif DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncvar, "ncvar", "ncvar"); // end octave_ncvar