[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

[hauberg]

The following commit has been merged in the master branch:
commit 3067872bf070c39f9becf463a3b1c0ba49422ada
Author: hauberg <hauberg at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Sun Jun 7 10:08:15 2009 +0000

    Allow compilation with Octave 3.2
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@5898 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/src/sym-create.cc b/src/sym-create.cc
index 0834b71..81150a4 100644
--- a/src/sym-create.cc
+++ b/src/sym-create.cc
@@ -17,6 +17,7 @@ along with this program; If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include <octave/oct.h>
 #include <octave/config.h>
 #include <octave/gripes.h>
 #include <octave/defun-dld.h>
@@ -36,6 +37,7 @@ is a number.\n\
 @end deftypefn\n\
 ")
 {
+  mlock ();
   octave_value retval;
   GiNaC::numeric d;
   int nargin = args.length();
@@ -71,6 +73,7 @@ DEFUN_DLD (sym,args, ,
 "-*- texinfo -*-\n\
 Create an object of type symbol\n")
 {
+  mlock ();
   octave_value retval;
   int nargin = args.length ();
 
@@ -106,6 +109,7 @@ is a number.\n\
 @end deftypefn\n\
 ")
 {
+  mlock ();
   octave_value retval;
   GiNaC::ex expression;
   int nargin = args.length();
diff --git a/src/symbols.cc b/src/symbols.cc
index 4ee0fc8..977525e 100644
--- a/src/symbols.cc
+++ b/src/symbols.cc
@@ -151,16 +151,6 @@ load_symbolic_type (void)
       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");
     }
 }
 

-- 
octave-symbolic