diff --git a/include/armadillo_bits/Base_bones.hpp b/include/armadillo_bits/Base_bones.hpp index ac947856..9c7e9ca5 100644 --- a/include/armadillo_bits/Base_bones.hpp +++ b/include/armadillo_bits/Base_bones.hpp @@ -127,11 +127,11 @@ struct Base arma_warn_unused inline elem_type min() const; arma_warn_unused inline elem_type max() const; - inline elem_type min(uword& index_of_min_val) const; - inline elem_type max(uword& index_of_max_val) const; + 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; - inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; - inline elem_type max(uword& row_of_max_val, uword& col_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_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 91449e18..6227ce9c 100644 --- a/include/armadillo_bits/Cube_bones.hpp +++ b/include/armadillo_bits/Cube_bones.hpp @@ -387,12 +387,11 @@ class Cube : public BaseCube< eT, Cube > arma_warn_unused inline eT min() const; arma_warn_unused inline eT max() const; - inline eT min(uword& index_of_min_val) const; - inline eT max(uword& index_of_max_val) const; - - inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const; - inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const; + 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_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 079c9f1a..957caaa6 100644 --- a/include/armadillo_bits/Mat_bones.hpp +++ b/include/armadillo_bits/Mat_bones.hpp @@ -541,11 +541,11 @@ class Mat : public Base< eT, Mat > arma_warn_unused inline eT min() const; arma_warn_unused inline eT max() const; - inline eT min(uword& index_of_min_val) const; - inline eT max(uword& index_of_max_val) const; + 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; - inline eT min(uword& row_of_min_val, uword& col_of_min_val) const; - inline eT max(uword& row_of_max_val, uword& col_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_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 cc53e93b..74ff3b46 100644 --- a/include/armadillo_bits/SpBase_bones.hpp +++ b/include/armadillo_bits/SpBase_bones.hpp @@ -76,11 +76,11 @@ struct SpBase arma_warn_unused inline elem_type min() const; arma_warn_unused inline elem_type max() const; - inline elem_type min(uword& index_of_min_val) const; - inline elem_type max(uword& index_of_max_val) const; + 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; - inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const; - inline elem_type max(uword& row_of_max_val, uword& col_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_warn_unused inline uword index_min() const; arma_warn_unused inline uword index_max() const; diff --git a/include/armadillo_bits/subview_bones.hpp b/include/armadillo_bits/subview_bones.hpp index 95553a10..876e5afb 100644 --- a/include/armadillo_bits/subview_bones.hpp +++ b/include/armadillo_bits/subview_bones.hpp @@ -428,8 +428,8 @@ class subview_col : public subview arma_warn_unused inline eT min() const; arma_warn_unused inline eT max() const; - inline eT min(uword& index_of_min_val) const; - inline eT max(uword& index_of_max_val) const; + 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_warn_unused inline uword index_min() const; arma_warn_unused inline uword index_max() const;