From b3329329a73c7e6f7568aa6573a7acb6f9ce3e4e Mon Sep 17 00:00:00 2001 From: conrad Date: Sat, 23 Nov 2024 00:42:36 +1000 Subject: [PATCH] expand deprecation warnings with messages --- include/armadillo_bits/Base_bones.hpp | 4 ++-- include/armadillo_bits/Cube_bones.hpp | 4 ++-- include/armadillo_bits/Mat_bones.hpp | 4 ++-- include/armadillo_bits/SpBase_bones.hpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/armadillo_bits/Base_bones.hpp b/include/armadillo_bits/Base_bones.hpp index 9c7e9ca5..8f1625ba 100644 --- a/include/armadillo_bits/Base_bones.hpp +++ b/include/armadillo_bits/Base_bones.hpp @@ -130,8 +130,8 @@ struct Base arma_frown("use .index_min() instead") inline elem_type min(uword& index_of_min_val) const; arma_frown("use .index_max() instead") inline elem_type max(uword& index_of_max_val) const; - arma_deprecated inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; - arma_deprecated inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const; + arma_frown("use .index_min() with ind2sub() instead") inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; + arma_frown("use .index_max() with ind2sub() instead") inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const; arma_warn_unused inline uword index_min() const; arma_warn_unused inline uword index_max() const; diff --git a/include/armadillo_bits/Cube_bones.hpp b/include/armadillo_bits/Cube_bones.hpp index 6227ce9c..ec452d33 100644 --- a/include/armadillo_bits/Cube_bones.hpp +++ b/include/armadillo_bits/Cube_bones.hpp @@ -390,8 +390,8 @@ class Cube : public BaseCube< eT, Cube > arma_frown("use .index_min() instead") inline eT min(uword& index_of_min_val) const; arma_frown("use .index_max() instead") inline eT max(uword& index_of_max_val) const; - arma_deprecated inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const; - arma_deprecated inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const; + arma_frown("use .index_min() with ind2sub() instead") inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const; + arma_frown("use .index_max() with ind2sub() instead") inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const; arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const; arma_cold inline bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const; diff --git a/include/armadillo_bits/Mat_bones.hpp b/include/armadillo_bits/Mat_bones.hpp index 69d92cf8..7ee55447 100644 --- a/include/armadillo_bits/Mat_bones.hpp +++ b/include/armadillo_bits/Mat_bones.hpp @@ -544,8 +544,8 @@ class Mat : public Base< eT, Mat > arma_frown("use .index_min() instead") inline eT min(uword& index_of_min_val) const; arma_frown("use .index_max() instead") inline eT max(uword& index_of_max_val) const; - arma_deprecated inline eT min(uword& row_of_min_val, uword& col_of_min_val) const; - arma_deprecated inline eT max(uword& row_of_max_val, uword& col_of_max_val) const; + arma_frown("use .index_min() with ind2sub() instead") inline eT min(uword& row_of_min_val, uword& col_of_min_val) const; + arma_frown("use .index_max() with ind2sub() instead") inline eT max(uword& row_of_max_val, uword& col_of_max_val) const; arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const; diff --git a/include/armadillo_bits/SpBase_bones.hpp b/include/armadillo_bits/SpBase_bones.hpp index 74ff3b46..677906be 100644 --- a/include/armadillo_bits/SpBase_bones.hpp +++ b/include/armadillo_bits/SpBase_bones.hpp @@ -79,8 +79,8 @@ struct SpBase arma_frown("use .index_min() instead") inline elem_type min(uword& index_of_min_val) const; arma_frown("use .index_max() instead") inline elem_type max(uword& index_of_max_val) const; - arma_deprecated inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; - arma_deprecated inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const; + arma_frown("use .index_min() with ind2sub() instead") inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const; + arma_frown("use .index_max() with ind2sub() instead") inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; arma_warn_unused inline uword index_min() const; arma_warn_unused inline uword index_max() const;