fre, 05 06 2009 kl. 21:58 +0200, skrev Benjamin Lindner:
> taking a look at octave/variables.h I find the prototype
> extern OCTINTERP_API void mlock (void);
>
> It seems that this has changed for octave 3.2, since in 3.0.5 I find the
> prototype
> extern OCTINTERP_API void mlock (const std::string&);
>
> which is how mlock is called in ov-netcdf.cc
I've applied the attached patch to SVN.
Søren
Index: main/octcdf/DESCRIPTION
===================================================================
--- main/octcdf/DESCRIPTION (revision 5896)
+++ main/octcdf/DESCRIPTION (working copy)
@@ -5,7 +5,7 @@
Maintainer: Alexander Barth <barth.alexan...@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
Index: main/octcdf/src/ov-netcdf.cc
===================================================================
--- main/octcdf/src/ov-netcdf.cc (revision 5896)
+++ main/octcdf/src/ov-netcdf.cc (working copy)
@@ -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();
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Octave-dev mailing list
Octave-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/octave-dev
