Mercurial > octave

diff libinterp/parse-tree/oct-parse.in.yy @ 23627:0a6e87804cab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use singleton pattern for dynamic_loader class * dynamic-ld.h, dynamic-ld.cc (dynamic_loader): Don't use singleton. Use Octave coding standard for member names. Change all uses. * interpreter.h, interpreter.cc (interpreter::m_dynamic_loader): New data member. (interpreter::get_dynamic_loader): New access function. * interpreter-private.h interpreter-private.cc (__get_dynamic_loader__): New function.
author John W. Eaton <jwe@octave.org>
date Fri, 16 Jun 2017 14:42:35 -0400
parents 91c8f006ed8b
children fca2f775ab4c
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.in.yy	Fri Jun 16 16:25:56 2017 -0400
+++ b/libinterp/parse-tree/oct-parse.in.yy	Fri Jun 16 14:42:35 2017 -0400
@@ -4535,12 +4535,15 @@
 
     int len = file.length ();
 
+      octave::dynamic_loader& dyn_loader
+        = __get_dynamic_loader__ ("~octave_mex_function");
+
     if (len > 4 && file.substr (len-4, len-1) == ".oct")
       {
         if (autoload && ! fcn_name.empty ())
           nm = fcn_name;
 
-        retval = octave::dynamic_loader::load_oct (nm, file, relative_lookup);
+        retval = dyn_loader.load_oct (nm, file, relative_lookup);
       }
     else if (len > 4 && file.substr (len-4, len-1) == ".mex")
       {
@@ -4553,7 +4556,7 @@
                                                   autoload, autoload,
                                                   relative_lookup, "");
 
-        retval = octave::dynamic_loader::load_mex (nm, file, relative_lookup);
+        retval = dyn_loader.load_mex (nm, file, relative_lookup);
 
         if (tmpfcn)
           retval->document (tmpfcn->doc_string ());