changeset 31450:db8735ee84da

maint: Remove more functions deprecated in Octave 7
author Arun Giridhar <arungiridhar@gmail.com>
date Wed, 16 Nov 2022 06:57:14 -0500
parents 2aa5bcaba504
children e9ba541e89b3
files libinterp/corefcn/error.h libinterp/parse-tree/bp-table.h libinterp/parse-tree/oct-lvalue.h liboctave/array/Array.h liboctave/array/DiagArray2.h liboctave/array/Range.h liboctave/numeric/CollocWt.h liboctave/numeric/oct-spparms.h liboctave/util/lo-ieee.h
diffstat 9 files changed, 0 insertions(+), 144 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/error.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/libinterp/corefcn/error.h	Wed Nov 16 06:57:14 2022 -0500
@@ -573,44 +573,4 @@
 
 OCTAVE_NAMESPACE_END
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-OCTAVE_DEPRECATED (7, "use 'octave::defun_usage_message' instead")
-inline void defun_usage_message (const std::string& msg)
-{
-  octave::defun_usage_message (msg);
-}
-
-OCTAVE_DEPRECATED (7, "use 'octave::set_warning_state' instead")
-inline octave_value_list
-set_warning_state (const std::string& id, const std::string& state)
-{
-  return octave::set_warning_state (id, state);
-}
-
-OCTAVE_DEPRECATED (7, "use 'octave::set_warning_state' instead")
-inline octave_value_list set_warning_state (const octave_value_list& args)
-{
-  return octave::set_warning_state (args);
-}
-
-OCTAVE_DEPRECATED (7, "use 'octave::warning_enabled' instead")
-inline int warning_enabled (const std::string& id)
-{
-  return octave::warning_enabled (id);
-}
-
-OCTAVE_DEPRECATED (7, "use 'octave::disable_warning' instead")
-inline void disable_warning (const std::string& id)
-{
-  octave::disable_warning (id);
-}
-
-OCTAVE_DEPRECATED (7, "use 'octave::interpreter_try' instead")
-inline void interpreter_try (octave::unwind_protect& uwp)
-{
-  octave::interpreter_try (uwp);
-}
-
 #endif
-
-#endif
--- a/libinterp/parse-tree/bp-table.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/libinterp/parse-tree/bp-table.h	Wed Nov 16 06:57:14 2022 -0500
@@ -79,26 +79,6 @@
     typedef fname_bp_map::const_iterator const_fname_bp_map_iterator;
     typedef fname_bp_map::iterator fname_bp_map_iterator;
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-    OCTAVE_DEPRECATED (7, "use 'bp_table::add_breakpoints_in_function' instead")
-    int add_breakpoint (const std::string& fname = "",
-                        const std::string& class_name = "",
-                        int line = 1,
-                        const std::string& condition = "")
-    {
-      return add_breakpoint_in_function (fname, class_name, line, condition);
-    }
-
-    OCTAVE_DEPRECATED (7, "use 'bp_table::add_breakpoints_in_function' instead")
-    bp_lines add_breakpoint (const std::string& fname = "",
-                             const std::string& class_name = "",
-                             const bp_lines& lines = bp_lines (),
-                             const std::string& condition = "")
-    {
-      return add_breakpoints_in_function (fname, class_name, lines, condition);
-    }
-#endif
-
     // Add a breakpoint at the nearest executable line in a function.
     int add_breakpoint_in_function (const std::string& fname = "",
                                     const std::string& class_name = "",
@@ -123,22 +103,6 @@
                                       const bp_lines& lines = bp_lines (),
                                       const std::string& condition = "");
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-    OCTAVE_DEPRECATED (7, "use 'bp_table::remove_breakpoint_from_function' instead")
-    int remove_breakpoint (const std::string& fname = "",
-                           int line = 1)
-    {
-      return remove_breakpoint_from_function (fname, line);
-    }
-
-    OCTAVE_DEPRECATED (7, "use 'bp_table::remove_breakpoints_from_function' instead")
-    int remove_breakpoint (const std::string& fname = "",
-                           const bp_lines& lines = bp_lines ())
-    {
-      return remove_breakpoints_from_function (fname, lines);
-    }
-#endif
-
     // Remove a breakpoint from the given line in file.
     int remove_breakpoint_from_function (const std::string& fname = "",
                                          int line = 1);
@@ -160,15 +124,6 @@
                                       const bp_lines& lines = bp_lines ());
 
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-    OCTAVE_DEPRECATED (7, "use 'bp_table::remove_all_breakpoints_from_function' instead")
-    bp_lines remove_all_breakpoints_in_file (const std::string& fname,
-                                             bool silent = false)
-    {
-      return remove_all_breakpoints_from_function (fname, silent);
-    }
-#endif
-
     // Remove all the breakpoints from a file.
     bp_lines remove_all_breakpoints_from_file (const std::string& file,
                                                bool silent = false);
--- a/libinterp/parse-tree/oct-lvalue.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/libinterp/parse-tree/oct-lvalue.h	Wed Nov 16 06:57:14 2022 -0500
@@ -81,14 +81,6 @@
 
     void unary_op (octave_value::unary_op op);
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-    OCTAVE_DEPRECATED (7, "use 'octave_lvalue::unary_op' instead")
-    void do_unary_op (octave_value::unary_op op)
-    {
-      return unary_op (op);
-    }
-#endif
-
     octave_value value (void) const;
 
   private:
--- a/liboctave/array/Array.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/array/Array.h	Wed Nov 16 06:57:14 2022 -0500
@@ -663,12 +663,6 @@
   OCTARRAY_OVERRIDABLE_FUNC_API const T * data (void) const
   { return m_slice_data; }
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-  OCTAVE_DEPRECATED (7, "for read-only access, use 'data' method instead")
-  OCTARRAY_OVERRIDABLE_FUNC_API const T * fortran_vec (void) const
-  { return data (); }
-#endif
-
   OCTARRAY_API T * fortran_vec (void);
 
   OCTARRAY_OVERRIDABLE_FUNC_API bool is_shared (void)
--- a/liboctave/array/DiagArray2.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/array/DiagArray2.h	Wed Nov 16 06:57:14 2022 -0500
@@ -168,11 +168,6 @@
 
   const T * data (void) const { return Array<T>::data (); }
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-  OCTAVE_DEPRECATED (7, "for read-only access, use 'data' method instead")
-  const T * fortran_vec (void) const { return Array<T>::data (); }
-#endif
-
   T * fortran_vec (void) { return Array<T>::fortran_vec (); }
 
   void print_info (std::ostream& os, const std::string& prefix) const
--- a/liboctave/array/Range.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/array/Range.h	Wed Nov 16 06:57:14 2022 -0500
@@ -562,27 +562,4 @@
   { }
 };
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator - (const Range& r);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator + (double x, const Range& r);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator + (const Range& r, double x);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator - (double x, const Range& r);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator - (const Range& r, double x);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator * (double x, const Range& r);
-
-OCTAVE_DEPRECATED (7, "arithmetic operations on Range objects are unreliable")
-extern OCTAVE_API Range operator * (const Range& r, double x);
 #endif
-
-#endif
--- a/liboctave/numeric/CollocWt.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/numeric/CollocWt.h	Wed Nov 16 06:57:14 2022 -0500
@@ -208,9 +208,4 @@
   };
 }
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-OCTAVE_DEPRECATED (7, "use 'octave::CollocWt' instead")
-typedef octave::CollocWt CollocWt;
 #endif
-
-#endif
--- a/liboctave/numeric/oct-spparms.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/numeric/oct-spparms.h	Wed Nov 16 06:57:14 2022 -0500
@@ -115,9 +115,4 @@
   };
 }
 
-#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
-OCTAVE_DEPRECATED (7, "use 'octave::sparse_params' instead")
-typedef octave::sparse_params octave_sparse_params;
 #endif
-
-#endif
--- a/liboctave/util/lo-ieee.h	Wed Nov 16 06:22:03 2022 -0500
+++ b/liboctave/util/lo-ieee.h	Wed Nov 16 06:57:14 2022 -0500
@@ -157,13 +157,6 @@
 
 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
 
-OCTAVE_DEPRECATED (7, "use '__lo_ieee_isfinite' instead")
-inline int __lo_ieee_finite (double x) { return __lo_ieee_isfinite (x); }
-
-OCTAVE_DEPRECATED (7, "use '__lo_ieee_float_isfinite' instead")
-inline int __lo_ieee_float_finite (float x)
-{ return __lo_ieee_float_isfinite (x); }
-
 #define lo_ieee_finite(x) lo_ieee_isfinite(x)
 
 #endif