Mercurial > octave-nkf

diff src/dynamic-ld.cc @ 3655:6324a4994278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-04-03 21:06:26 by jwe]
author jwe
date Mon, 03 Apr 2000 21:06:27 +0000
parents e8fbc8c3d6d9
children 96679fb690a4
line wrap: on
line diff
--- a/src/dynamic-ld.cc	Fri Mar 31 23:39:59 2000 +0000
+++ b/src/dynamic-ld.cc	Mon Apr 03 21:06:27 2000 +0000
@@ -184,7 +184,7 @@
 
   if (! instance)
     {
-      error ("unable to create dynamic loader object!");
+      ::error ("unable to create dynamic loader object!");
 
       retval = false;
     }
@@ -254,8 +254,8 @@
 		      function = oct_file.search (fcn_name, mangle_name);
 		    }
 		  else
-		    error ("%s is not a valid shared library",
-			   oct_file_name.c_str ());
+		    ::error ("%s is not a valid shared library",
+			     oct_file_name.c_str ());
 		}
 	    }
 	}
@@ -267,10 +267,10 @@
 	= X_CAST (octave_dld_fcn_installer, function);
 
       retval = f (oct_file);
-
-      if (! retval)
-	error ("failed to install dld function `%s'", fcn_name.c_str ());
     }
+  
+  if (! retval)
+    ::error ("failed to install dld function `%s'", fcn_name.c_str ());
 
   unwind_protect::run_frame ("octave_dynamic_loader::do_load");