diff libinterp/corefcn/dynamic-ld.cc @ 20463:7ac907da9fba

Use error() rather than ::error() unless explicitly required. * resource-manager.cc (instance_ok), shortcut-manager.cc (instance_ok), daspk.cc (DASPK_ABORT, DASPK_ABORT2), dasrt.cc (DASRT_ABORT, DASRT_ABORT2), dassl.cc (DASSL_ABORT, DASSL_ABORT2), debug.cc (instance_ok), display.cc (instance_ok), dynamic-ld.cc (octave_shlib_list::instance_ok, octave_dynamic_loader::instance_ok, do_load_oct, do_load_mex), file-io.cc (fopen_mode_to_ios_mode, do_stream_open, Ffprintf, Fsprintf, Fscanf, Ffscanf, get_sscanf_data, Fsscanf, do_fread, do_fwrite, Fpopen, Ftempname, convert, Fumask), graphics.in.h (graphics_toolkit::instance_ok, gh_manager::instance_ok), load-path.cc (instance_ok), ls-oct-ascii.cc (save_three_d), lsode.cc (LSODE_ABORT, LSODE_ABORT2), oct-errno.in.cc (instance_ok), octave-link.cc (connect_link), pager.cc (octave_pager_stream::instance_ok, octave_diary_stream::instance_ok), quad.cc (QUAD_ABORT, QUAD_ABORT2), sighandlers.cc (w32_interrupt_manager::instance_ok, octave_child_list::instance_ok), symtab.cc (do_update_nest), symtab.h (instance_ok), syscalls.cc (convert), toplev.h (instance_ok), txt-eng-ft.cc (instance_ok, set_mode), urlwrite.cc (instance_ok), __init_fltk__.cc (instance_ok), ov-builtin.cc (do_multi_index_op), ov-classdef.cc (class_fevalStatic, make_class, octave_classdef::subsasgn, do_multi_index_op, cdef_object_array::subsref, cdef_object_array::subsasgn, install_meth, meta_subsref, run_constructor, make_meta_class, get_value, set_value, check_method), ov-classdef.h (meta_subsref, instance_ok), ov-fcn-handle.cc (octave_fcn_handle), ov-mex-fcn.cc (do_multi_index_op), ov-range.h (octave_range), ov-typeinfo.cc (instance_ok), ov-usr-fcn.cc (subsref, do_multi_index_op), pt-arg-list.cc (Fend, convert_to_const_vector), pt-cell.cc (rvalue1), pt-colon.cc (append, rvalue1), pt-eval.cc (visit_simple_for_command, visit_switch_command), pt-exp.cc (is_logically_true, rvalue), pt-id.cc (eval_undefined_error), pt-id.h (workspace_error), pt-mat.cc (get_concat_class): Use error() rather than ::error().
author Rik <rik@octave.org>
date Thu, 06 Aug 2015 08:09:01 -0700
parents 4197fc428c7d
children f90c8372b7ba
line wrap: on
line diff
--- a/libinterp/corefcn/dynamic-ld.cc	Wed Aug 05 22:47:41 2015 -0700
+++ b/libinterp/corefcn/dynamic-ld.cc	Thu Aug 06 08:09:01 2015 -0700
@@ -160,7 +160,7 @@
 
   if (! instance)
     {
-      ::error ("unable to create shared library list object!");
+      error ("unable to create shared library list object!");
 
       retval = false;
     }
@@ -216,7 +216,7 @@
 
   if (! instance)
     {
-      ::error ("unable to create dynamic loader object!");
+      error ("unable to create dynamic loader object!");
 
       retval = false;
     }
@@ -295,13 +295,12 @@
               retval = f (oct_file, relative);
 
               if (! retval)
-                ::error ("failed to install .oct file function '%s'",
-                         fcn_name.c_str ());
+                error ("failed to install .oct file function '%s'",
+                       fcn_name.c_str ());
             }
         }
       else
-        ::error ("%s is not a valid shared library",
-                 file_name.c_str ());
+        error ("%s is not a valid shared library", file_name.c_str ());
     }
 
   return retval;
@@ -363,12 +362,11 @@
             retval = new octave_mex_function (function, have_fmex,
                                               mex_file, fcn_name);
           else
-            ::error ("failed to install .mex file function '%s'",
-                     fcn_name.c_str ());
+            error ("failed to install .mex file function '%s'",
+                   fcn_name.c_str ());
         }
       else
-        ::error ("%s is not a valid shared library",
-                 file_name.c_str ());
+        error ("%s is not a valid shared library", file_name.c_str ());
     }
 
   return retval;