From: <ha...@us...> - 2009-06-07 10:08:44
|
Revision: 5898 http://octave.svn.sourceforge.net/octave/?rev=5898&view=rev Author: hauberg Date: 2009-06-07 10:08:15 +0000 (Sun, 07 Jun 2009) Log Message: ----------- Allow compilation with Octave 3.2 Modified Paths: -------------- trunk/octave-forge/main/symbolic/src/sym-create.cc trunk/octave-forge/main/symbolic/src/symbols.cc Modified: trunk/octave-forge/main/symbolic/src/sym-create.cc =================================================================== --- trunk/octave-forge/main/symbolic/src/sym-create.cc 2009-06-07 09:53:42 UTC (rev 5897) +++ trunk/octave-forge/main/symbolic/src/sym-create.cc 2009-06-07 10:08:15 UTC (rev 5898) @@ -17,6 +17,7 @@ */ +#include <octave/oct.h> #include <octave/config.h> #include <octave/gripes.h> #include <octave/defun-dld.h> @@ -36,6 +37,7 @@ @end deftypefn\n\ ") { + mlock (); octave_value retval; GiNaC::numeric d; int nargin = args.length(); @@ -71,6 +73,7 @@ "-*- texinfo -*-\n\ Create an object of type symbol\n") { + mlock (); octave_value retval; int nargin = args.length (); @@ -106,6 +109,7 @@ @end deftypefn\n\ ") { + mlock (); octave_value retval; GiNaC::ex expression; int nargin = args.length(); Modified: trunk/octave-forge/main/symbolic/src/symbols.cc =================================================================== --- trunk/octave-forge/main/symbolic/src/symbols.cc 2009-06-07 09:53:42 UTC (rev 5897) +++ trunk/octave-forge/main/symbolic/src/symbols.cc 2009-06-07 10:08:15 UTC (rev 5898) @@ -151,16 +151,6 @@ install_ex_ops(); install_vpa_ops(); symbolic_type_loaded = true; - - // We should lock the constructor functions of this type in place, - // otherwise something like - // "symbols(); a=sym('V_max'); clear functions; a" generates - // a seg-fault. Note this relies on the fact that Fsym, Fex_matrix - // and Fvpa are linked into the symbols.oct file. If th - // moved to this locking needs to be rethought. - mlock ("sym"); - mlock ("ex_matrix"); - mlock ("vpa"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |