Mercurial > forge
changeset 5715:f75e106fda4f octave-forge
Allow compilation with Octave 3.2
| author | hauberg |
|---|---|
| date | Sun, 07 Jun 2009 10:16:15 +0000 |
| parents | 801ec1ab0f03 |
| children | a5c0ea5706b6 |
| files | main/octcdf/DESCRIPTION main/octcdf/src/ov-netcdf.cc |
| diffstat | 2 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/main/octcdf/DESCRIPTION Sun Jun 07 10:08:53 2009 +0000 +++ b/main/octcdf/DESCRIPTION Sun Jun 07 10:16:15 2009 +0000 @@ -5,7 +5,7 @@ Maintainer: Alexander Barth <barth.alexander@gmail.com> Title: octcdf Description: A NetCDF interface for octave -Depends: octave (>= 2.9.7) +Depends: octave (>= 3.1.55) Autoload: yes BuildRequires: netcdf-devel License: GPL version 2 or later
--- a/main/octcdf/src/ov-netcdf.cc Sun Jun 07 10:08:53 2009 +0000 +++ b/main/octcdf/src/ov-netcdf.cc Sun Jun 07 10:16:15 2009 +0000 @@ -50,14 +50,6 @@ octave_ncdim::register_type (); netcdf_type_loaded = true; - - // Lock constructor function in place, otherwise - // "nc=netcdf("file.nc","r"); clear functions; nc" generates a seg-fault!! - - mlock("netcdf"); - mlock("ncvar"); - mlock("ncatt"); - mlock("ncdim"); } @@ -99,6 +91,7 @@ @end deftypefn\n\ @seealso{ncclose}\n") { + mlock (); string format; // @@ -244,7 +237,7 @@ @end example \n\ @seealso{ncatt,ncdim,ncname,ncdatatype}\n") { - + mlock (); if (args.length() != 1) { print_usage (); return octave_value(); @@ -285,7 +278,7 @@ @end example \n\ @seealso{ncvar,ncdim,ncname,ncdatatype}\n") { - + mlock (); if (args.length() != 1) { print_usage (); return octave_value(); @@ -330,7 +323,7 @@ @end deftypefn\n\ @seealso{ncvar}\n") { - + mlock (); if (args.length() != 1) { print_usage (); return octave_value();