[Octave-cvsupdate] SF.net SVN: octave:[5900] trunk/octave-forge/main/octcdf

[<ha...@us...>]

Revision: 5900
          http://octave.svn.sourceforge.net/octave/?rev=5900&view=rev
Author:   hauberg
Date:     2009-06-07 10:16:15 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
Allow compilation with Octave 3.2

Modified Paths:
--------------
    trunk/octave-forge/main/octcdf/DESCRIPTION
    trunk/octave-forge/main/octcdf/src/ov-netcdf.cc

Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION	2009-06-07 10:08:53 UTC (rev 5899)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION	2009-06-07 10:16:15 UTC (rev 5900)
@@ -5,7 +5,7 @@
 Maintainer: Alexander Barth <bar...@gm...>
 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

Modified: trunk/octave-forge/main/octcdf/src/ov-netcdf.cc
===================================================================
--- trunk/octave-forge/main/octcdf/src/ov-netcdf.cc	2009-06-07 10:08:53 UTC (rev 5899)
+++ trunk/octave-forge/main/octcdf/src/ov-netcdf.cc	2009-06-07 10:16:15 UTC (rev 5900)
@@ -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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.