diff libinterp/octave-value/ov.h @ 21134:2e5c1f766ac9

provide replacement hints for deprecated C++ functions * oct-conf-post.in.h (OCTAVE_DEPRECATED): Accept message argument. * error.h, errwarn.h, gripes.h, symtab.h, variables.h, * ov-base-sparse.h, ov-base.h, ov.h, Array.h, DiagArray2.h, * PermMatrix.h, Range.h, Sparse.h, dSparse.h, lo-array-errwarn.h, * lo-array-gripes.h, unwind-prot.h: Change all uses of OCTAVE_DEPRECATED.
author John W. Eaton <jwe@octave.org>
date Fri, 22 Jan 2016 12:15:12 -0500
parents b433f9990452
children 538b57866b90
line wrap: on
line diff
--- a/libinterp/octave-value/ov.h	Fri Jan 22 12:12:56 2016 -0500
+++ b/libinterp/octave-value/ov.h	Fri Jan 22 12:15:12 2016 -0500
@@ -242,12 +242,16 @@
   octave_value (const charMatrix& chm,  char type = '\'');
   octave_value (const charNDArray& chnda, char type = '\'');
   octave_value (const Array<char>& chnda, char type = '\'');
-  OCTAVE_DEPRECATED octave_value (const charMatrix& chm, bool is_string,
-                                    char type = '\'');
-  OCTAVE_DEPRECATED octave_value (const charNDArray& chnda, bool is_string,
-                                    char type = '\'');
-  OCTAVE_DEPRECATED octave_value (const Array<char>& chnda, bool is_string,
-                                    char type = '\'');
+
+  OCTAVE_DEPRECATED ("note: IS_STRING argument is ignored")
+  octave_value (const charMatrix& chm, bool is_string, char type = '\'');
+
+  OCTAVE_DEPRECATED ("note: IS_STRING argument is ignored")
+  octave_value (const charNDArray& chnda, bool is_string, char type = '\'');
+
+  OCTAVE_DEPRECATED ("note: IS_STRING argument is ignored")
+  octave_value (const Array<char>& chnda, bool is_string, char type = '\'');
+
   octave_value (const SparseMatrix& m, const MatrixType& t = MatrixType ());
   octave_value (const Sparse<double>& m, const MatrixType& t = MatrixType ());
   octave_value (const SparseComplexMatrix& m,
@@ -296,7 +300,9 @@
   octave_value (octave_value::magic_colon);
 
   octave_value (octave_base_value *new_rep, bool borrow = false);
-  OCTAVE_DEPRECATED octave_value (octave_base_value *new_rep, int xcount);
+
+  OCTAVE_DEPRECATED ("note: in the future there will be no way to directly set reference count")
+  octave_value (octave_base_value *new_rep, int xcount);
 
   // Copy constructor.
 
@@ -481,7 +487,8 @@
   octave_idx_type numel (void) const
   { return rep->numel (); }
 
-  OCTAVE_DEPRECATED octave_idx_type capacity (void) const
+  OCTAVE_DEPRECATED ("use 'numel' instead")
+  octave_idx_type capacity (void) const
   { return rep->numel (); }
 
   size_t byte_size (void) const
@@ -892,7 +899,8 @@
   string_vector string_vector_value (bool pad = false) const
   { return rep->string_vector_value (pad); }
 
-  OCTAVE_DEPRECATED string_vector all_strings (bool pad = false) const
+  OCTAVE_DEPRECATED ("use 'string_vector_value' instead")
+  string_vector all_strings (bool pad = false) const
   { return string_vector_value (pad); }
 
   Cell cell_value (void) const;