Mercurial > octave
diff liboctave/util/oct-shlib.cc @ 22869:f75d289645ec
make deleted functions public
* octave-gui.h, resource-manager.h, shortcut-manager.h,
base-text-renderer.h, c-file-ptr-stream.h, dynamic-ld.cc,
dynamic-ld.h, event-queue.h, ft-text-renderer.cc, gl-render.cc,
gl-render.h, graphics.cc, graphics.in.h, interpreter.h, mex.cc,
mxarray.in.h, oct-fstrm.h, oct-iostrm.h, oct-prcstrm.h,
oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h,
oct-strstrm.h, octave-link.h, pager.h, profiler.h, sighandlers.cc,
symtab.h, text-renderer.h, zfstream.h, __init_fltk__.cc,
ov-builtin.h, ov-dld-fcn.h, ov-fcn.h, ov-mex-fcn.h, ov-typeinfo.h,
ov-usr-fcn.h, octave.h, lex.h, parse.h, pt-arg-list.h,
pt-array-list.h, pt-assign.h, pt-binop.h, pt-bp.h, pt-cell.h,
pt-check.h, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h,
pt-decl.h, pt-eval.h, pt-except.h, pt-exp.h, pt-fcn-handle.h,
pt-funcall.h, pt-id.h, pt-idx.h, pt-jump.h, pt-loop.h, pt-mat.h,
pt-misc.h, pt-pr-code.h, pt-select.h, pt-stmt.h, pt-unop.h,
pt-walk.h, pt.h, token.h, Array.cc, idx-vector.h, oct-fftw.h,
sparse-chol.cc, sparse-qr.cc, file-ops.h, mach-info.h, oct-env.h,
action-container.h, cmd-edit.cc, cmd-edit.h, cmd-hist.h,
oct-locbuf.h, oct-mutex.h, oct-shlib.cc, oct-sort.h, pathsearch.h,
singleton-cleanup.h, unwind-prot.h, url-transfer.cc, url-transfer.h:
Declare deleted copy constructors and assignment operators public.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2016 12:40:45 -0500 |
parents | 89756f2f085b |
children | 2830a770405b |
line wrap: on
line diff
--- a/liboctave/util/oct-shlib.cc Tue Dec 06 10:59:29 2016 -0500 +++ b/liboctave/util/oct-shlib.cc Tue Dec 06 12:40:45 2016 -0500 @@ -164,6 +164,12 @@ octave_dlopen_shlib (const std::string& f); + // No copying! + + octave_dlopen_shlib (const octave_dlopen_shlib&) = delete; + + octave_dlopen_shlib& operator = (const octave_dlopen_shlib&) = delete; + ~octave_dlopen_shlib (void); void *search (const std::string& name, @@ -177,12 +183,6 @@ private: - // No copying! - - octave_dlopen_shlib (const octave_dlopen_shlib&) = delete; - - octave_dlopen_shlib& operator = (const octave_dlopen_shlib&) = delete; - void *library; }; @@ -255,6 +255,12 @@ octave_shl_load_shlib (const std::string& f); + // No copying! + + octave_shl_load_shlib (const octave_shl_load_shlib&) = delete; + + octave_shl_load_shlib& operator = (const octave_shl_load_shlib&) = delete; + ~octave_shl_load_shlib (void); void *search (const std::string& name, @@ -264,12 +270,6 @@ private: - // No copying! - - octave_shl_load_shlib (const octave_shl_load_shlib&) = delete; - - octave_shl_load_shlib& operator = (const octave_shl_load_shlib&) = delete; - shl_t library; }; @@ -323,6 +323,12 @@ octave_w32_shlib (const std::string& f); + // No copying! + + octave_w32_shlib (const octave_w32_shlib&) = delete; + + octave_w32_shlib& operator = (const octave_w32_shlib&) = delete; + ~octave_w32_shlib (void); void *search (const std::string& name, @@ -332,12 +338,6 @@ private: - // No copying! - - octave_w32_shlib (const octave_w32_shlib&) = delete; - - octave_w32_shlib& operator = (const octave_w32_shlib&) = delete; - HINSTANCE handle; }; @@ -422,6 +422,12 @@ octave_dyld_shlib (void); + // No copying! + + octave_dyld_shlib (const octave_dyld_shlib&) = delete; + + octave_dyld_shlib& operator = (const octave_dyld_shlib&) = delete; + ~octave_dyld_shlib (void); void open (const std::string& f); @@ -435,12 +441,6 @@ private: - // No copying! - - octave_dyld_shlib (const octave_dyld_shlib&) = delete; - - octave_dyld_shlib& operator = (const octave_dyld_shlib&) = delete; - NSObjectFileImage img; NSModule handle; };