Mercurial > octave

diff src/dynamic-ld.cc @ 4243:7e4d5b5520e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-12-27 05:30:59 by jwe]
author jwe
date Fri, 27 Dec 2002 05:30:59 +0000
parents ccfdb55c8156
children ed0f3cb6d3d4
line wrap: on
line diff
--- a/src/dynamic-ld.cc	Thu Dec 26 22:06:30 2002 +0000
+++ b/src/dynamic-ld.cc	Fri Dec 27 05:30:59 2002 +0000
@@ -209,7 +209,8 @@
 }
 
 bool
-octave_dynamic_loader::do_load (const std::string& fcn_name)
+octave_dynamic_loader::do_load (const std::string& fcn_name,
+				const std::string& file_name)
 {
   bool retval = false;
 
@@ -241,7 +242,8 @@
 
       if (! function)
 	{
-	  std::string oct_file_name = oct_file_in_path (fcn_name);
+	  std::string oct_file_name
+	    = file_name.empty () ? oct_file_in_path (fcn_name) : file_name;
 
 	  if (! oct_file_name.empty ())
 	    {
@@ -299,9 +301,10 @@
 }
 
 bool
-octave_dynamic_loader::load (const std::string& fcn_name)
+octave_dynamic_loader::load (const std::string& fcn_name,
+			     const std::string& file_name)
 {
-  return (instance_ok ()) ? instance->do_load (fcn_name) : false;
+  return (instance_ok ()) ? instance->do_load (fcn_name, file_name) : false;
 }
 
 bool