Mercurial > octave

diff libinterp/corefcn/oct-stream.cc @ 22869:f75d289645ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 87e3163f6c87
children ae6c01558d25
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc	Tue Dec 06 10:59:29 2016 -0500
+++ b/libinterp/corefcn/oct-stream.cc	Tue Dec 06 12:40:45 2016 -0500
@@ -242,6 +242,12 @@
 
   scanf_format_list (const std::string& fmt = "");
 
+  // No copying!
+
+  scanf_format_list (const scanf_format_list&) = delete;
+
+  scanf_format_list& operator = (const scanf_format_list&) = delete;
+
   ~scanf_format_list (void);
 
   octave_idx_type num_conversions (void) { return nconv; }
@@ -317,11 +323,6 @@
   int finish_conversion (const std::string& s, size_t& i, size_t n,
                          int& width, bool discard, char& type,
                          char modifier);
-  // No copying!
-
-  scanf_format_list (const scanf_format_list&) = delete;
-
-  scanf_format_list& operator = (const scanf_format_list&) = delete;
 };
 
 scanf_format_list::scanf_format_list (const std::string& s)
@@ -793,6 +794,12 @@
 
   printf_format_list (const std::string& fmt = "");
 
+  // No copying!
+
+  printf_format_list (const printf_format_list&) = delete;
+
+  printf_format_list& operator = (const printf_format_list&) = delete;
+
   ~printf_format_list (void);
 
   octave_idx_type num_conversions (void) { return nconv; }
@@ -858,12 +865,6 @@
   void finish_conversion (const std::string& s, size_t& i, int args,
                           const std::string& flags, int fw, int prec,
                           char modifier, char& type);
-
-  // No copying!
-
-  printf_format_list (const printf_format_list&) = delete;
-
-  printf_format_list& operator = (const printf_format_list&) = delete;
 };
 
 printf_format_list::printf_format_list (const std::string& s)
@@ -1224,6 +1225,12 @@
 
     delimited_stream (std::istream& is, const delimited_stream& ds);
 
+    // No copying!
+
+    delimited_stream (const delimited_stream&) = delete;
+
+    delimited_stream& operator = (const delimited_stream&) = delete;
+
     ~delimited_stream (void);
 
     // Called when optimized sequence of get is finished.  Ensures that
@@ -1338,12 +1345,6 @@
     char *progress_marker;
 
     std::ios_base::iostate flags;
-
-    // No copying!
-
-    delimited_stream (const delimited_stream&) = delete;
-
-    delimited_stream& operator = (const delimited_stream&) = delete;
   };
 
   // Create a delimited stream, reading from is, with delimiters delims,
@@ -1690,6 +1691,11 @@
 
     textscan_format_list (const std::string& fmt = std::string (),
                           const std::string& who = "textscan");
+    // No copying!
+
+    textscan_format_list (const textscan_format_list&) = delete;
+
+    textscan_format_list& operator = (const textscan_format_list&) = delete;
 
     ~textscan_format_list (void);
 
@@ -1778,11 +1784,6 @@
                            unsigned int& width, int& prec, int& bitwidth,
                            octave_value& val_type,
                            bool discard, char& type);
-    // No copying!
-
-    textscan_format_list (const textscan_format_list&) = delete;
-
-    textscan_format_list& operator = (const textscan_format_list&) = delete;
   };
 
   // Main class to implement textscan.  Read data and parse it
@@ -1801,6 +1802,12 @@
 
     textscan (const std::string& who_arg = "textscan");
 
+    // No copying!
+
+    textscan (const textscan&) = delete;
+
+    textscan& operator = (const textscan&) = delete;
+
     ~textscan (void) = default;
 
     octave_value scan (std::istream& isp, const std::string& fmt,
@@ -1930,12 +1937,6 @@
 
     // True if the only delimiter is whitespace.
     bool whitespace_delim (void) const { return delim_table.empty (); }
-
-    // No copying!
-
-    textscan (const textscan&) = delete;
-
-    textscan& operator = (const textscan&) = delete;
   };
 
   textscan_format_list::textscan_format_list (const std::string& s,
@@ -5297,6 +5298,12 @@
       }
   }
 
+  // No copying!
+
+  printf_value_cache (const printf_value_cache&) = delete;
+
+  printf_value_cache& operator = (const printf_value_cache&) = delete;
+
   ~printf_value_cache (void) = default;
 
   // Get the current value as a double and advance the internal pointer.
@@ -5323,12 +5330,6 @@
   // Must create value cache with values!
 
   printf_value_cache (void);
-
-  // No copying!
-
-  printf_value_cache (const printf_value_cache&) = delete;
-
-  printf_value_cache& operator = (const printf_value_cache&) = delete;
 };
 
 octave_value