Mercurial > octave

diff libinterp/corefcn/dynamic-ld.h @ 23696:08036a7f3660

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove octave:: namespace tag from symbols used inside octave namespace * octave-gui.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, input.cc, input.h, interpreter.cc, load-path.cc, load-path.h, oct-stream.cc, sighandlers.cc, symtab.cc, symtab.h, __ode15__.cc, gzip.cc, octave.cc, lex.ll, oct-parse.in.yy, parse.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-classdef.h, pt-decl.h, pt-eval.cc, pt-eval.h, pt-exp.h, pt-fcn-handle.cc, pt-idx.cc, pt-misc.h, pt-select.h, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt.cc, aepbalance.cc, chol.cc, gepbalance.cc, gsvd.cc, hess.cc, lo-mappers.h, lo-specfun.cc, lu.cc, qr.cc, qrp.cc, schur.cc, sparse-chol.cc, sparse-lu.cc, sparse-qr.cc, svd.cc, child-list.cc, dir-ops.cc, file-ops.cc, file-stat.cc, file-stat.h, lo-sysdep.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, oct-glob.cc, oct-locbuf.cc, oct-mutex.cc, oct-mutex.h, oct-shlib.cc, oct-shlib.h, pathsearch.cc, url-transfer.cc, url-transfer.h: Remove octave:: namespace tag from symbols used inside octave namespace. * oct-conf-post.in.h (OCTAVE_USE_DEPRECATED_FUNCTIONS): Don't define.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Jun 2017 09:05:37 -0400
parents 0a6e87804cab
children 194eb4bd202b
line wrap: on
line diff
--- a/libinterp/corefcn/dynamic-ld.h	Mon Jun 26 09:02:21 2017 -0400
+++ b/libinterp/corefcn/dynamic-ld.h	Mon Jun 26 09:05:37 2017 -0400
@@ -46,8 +46,8 @@
     {
     public:
 
-      typedef std::list<octave::dynamic_library>::iterator iterator;
-      typedef std::list<octave::dynamic_library>::const_iterator const_iterator;
+      typedef std::list<dynamic_library>::iterator iterator;
+      typedef std::list<dynamic_library>::const_iterator const_iterator;
 
       shlibs_list (void) : m_lib_list () { }
 
@@ -59,18 +59,18 @@
 
       ~shlibs_list (void) = default;
 
-      void append (const octave::dynamic_library& shl);
+      void append (const dynamic_library& shl);
 
-      std::list<std::string> remove (octave::dynamic_library& shl);
+      std::list<std::string> remove (dynamic_library& shl);
 
-      octave::dynamic_library find_file (const std::string& file_name) const;
+      dynamic_library find_file (const std::string& file_name) const;
 
       void display (void) const;
 
     private:
 
       // List of libraries we have loaded.
-      std::list<octave::dynamic_library> m_lib_list;
+      std::list<dynamic_library> m_lib_list;
     };
 
 
@@ -99,16 +99,16 @@
               bool relative = false);
 
     bool remove_oct (const std::string& fcn_name,
-                            octave::dynamic_library& shl);
+                            dynamic_library& shl);
 
     bool remove_mex (const std::string& fcn_name,
-                            octave::dynamic_library& shl);
+                            dynamic_library& shl);
 
   private:
 
     void clear_function (const std::string& fcn_name);
 
-    void clear (octave::dynamic_library& oct_file);
+    void clear (dynamic_library& oct_file);
 
     interpreter& m_interpreter;