Mercurial > octave

comparison 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
comparison
equal deleted inserted replaced
4242:4d3994172bd5 4243:7e4d5b5520e5
207 207
208 fbi_sym_tab->clear (fcn_name); 208 fbi_sym_tab->clear (fcn_name);
209 } 209 }
210 210
211 bool 211 bool
212 octave_dynamic_loader::do_load (const std::string& fcn_name) 212 octave_dynamic_loader::do_load (const std::string& fcn_name,
213 const std::string& file_name)
213 { 214 {
214 bool retval = false; 215 bool retval = false;
215 216
216 octave_shlib oct_file; 217 octave_shlib oct_file;
217 218
239 function = 0; 240 function = 0;
240 } 241 }
241 242
242 if (! function) 243 if (! function)
243 { 244 {
244 std::string oct_file_name = oct_file_in_path (fcn_name); 245 std::string oct_file_name
246 = file_name.empty () ? oct_file_in_path (fcn_name) : file_name;
245 247
246 if (! oct_file_name.empty ()) 248 if (! oct_file_name.empty ())
247 { 249 {
248 oct_file.open (oct_file_name, Vwarn_future_time_stamp); 250 oct_file.open (oct_file_name, Vwarn_future_time_stamp);
249 251
297 299
298 return retval; 300 return retval;
299 } 301 }
300 302
301 bool 303 bool
302 octave_dynamic_loader::load (const std::string& fcn_name) 304 octave_dynamic_loader::load (const std::string& fcn_name,
303 { 305 const std::string& file_name)
304 return (instance_ok ()) ? instance->do_load (fcn_name) : false; 306 {
307 return (instance_ok ()) ? instance->do_load (fcn_name, file_name) : false;
305 } 308 }
306 309
307 bool 310 bool
308 octave_dynamic_loader::remove (const std::string& fcn_name, octave_shlib& shl) 311 octave_dynamic_loader::remove (const std::string& fcn_name, octave_shlib& shl)
309 { 312 {