From 3e7ca66f11bee537202efe68e17f5ad50b6da3c9 Mon Sep 17 00:00:00 2001 From: conrad Date: Mon, 13 Feb 2023 00:10:03 +1000 Subject: [PATCH] cleanup attributes --- include/armadillo_bits/BaseCube_bones.hpp | 22 +- include/armadillo_bits/BaseCube_meat.hpp | 17 -- include/armadillo_bits/Base_bones.hpp | 66 ++--- include/armadillo_bits/Base_meat.hpp | 39 --- include/armadillo_bits/Col_bones.hpp | 48 ++-- include/armadillo_bits/Col_meat.hpp | 27 -- include/armadillo_bits/Cube_bones.hpp | 106 ++++---- include/armadillo_bits/Cube_meat.hpp | 61 +---- include/armadillo_bits/MapMat_bones.hpp | 42 ++-- include/armadillo_bits/MapMat_meat.hpp | 17 -- include/armadillo_bits/Mat_bones.hpp | 236 +++++++++--------- include/armadillo_bits/Mat_meat.hpp | 118 +-------- include/armadillo_bits/Row_bones.hpp | 48 ++-- include/armadillo_bits/Row_meat.hpp | 27 -- include/armadillo_bits/SpBase_bones.hpp | 54 ++-- include/armadillo_bits/SpBase_meat.hpp | 37 --- include/armadillo_bits/SpCol_bones.hpp | 6 +- include/armadillo_bits/SpCol_meat.hpp | 3 - include/armadillo_bits/SpMat_bones.hpp | 180 ++++++------- .../armadillo_bits/SpMat_iterators_meat.hpp | 34 --- include/armadillo_bits/SpMat_meat.hpp | 68 +---- include/armadillo_bits/SpRow_bones.hpp | 6 +- include/armadillo_bits/SpRow_meat.hpp | 3 - include/armadillo_bits/SpSubview_bones.hpp | 84 +++---- .../SpSubview_iterators_meat.hpp | 34 --- include/armadillo_bits/SpSubview_meat.hpp | 17 -- include/armadillo_bits/arma_ostream_meat.hpp | 11 - include/armadillo_bits/arrayops_meat.hpp | 32 --- include/armadillo_bits/compiler_setup.hpp | 7 +- include/armadillo_bits/diskio_bones.hpp | 18 +- include/armadillo_bits/diskio_meat.hpp | 9 - include/armadillo_bits/eglue_core_meat.hpp | 10 - include/armadillo_bits/eop_core_meat.hpp | 18 +- include/armadillo_bits/field_bones.hpp | 72 +++--- include/armadillo_bits/field_meat.hpp | 46 +--- include/armadillo_bits/fn_log_det.hpp | 4 +- include/armadillo_bits/fn_log_normpdf.hpp | 12 +- include/armadillo_bits/fn_norm.hpp | 12 +- include/armadillo_bits/fn_normcdf.hpp | 12 +- include/armadillo_bits/fn_normpdf.hpp | 12 +- include/armadillo_bits/glue_times_meat.hpp | 15 -- include/armadillo_bits/gmm_diag_meat.hpp | 2 - include/armadillo_bits/gmm_misc_meat.hpp | 1 - include/armadillo_bits/injector_meat.hpp | 19 -- include/armadillo_bits/op_det_meat.hpp | 3 - include/armadillo_bits/op_dot_meat.hpp | 15 -- include/armadillo_bits/op_htrans_meat.hpp | 6 - include/armadillo_bits/op_inv_gen_meat.hpp | 3 - include/armadillo_bits/op_inv_spd_meat.hpp | 3 - include/armadillo_bits/op_mean_meat.hpp | 2 - include/armadillo_bits/op_norm_meat.hpp | 12 - include/armadillo_bits/op_strans_meat.hpp | 5 - include/armadillo_bits/op_sum_meat.hpp | 8 - include/armadillo_bits/podarray_meat.hpp | 2 - .../armadillo_bits/running_stat_vec_meat.hpp | 2 - include/armadillo_bits/spglue_merge_meat.hpp | 4 - include/armadillo_bits/spglue_minus_meat.hpp | 3 - include/armadillo_bits/spglue_plus_meat.hpp | 3 - include/armadillo_bits/spglue_schur_meat.hpp | 3 - include/armadillo_bits/spglue_times_meat.hpp | 1 - include/armadillo_bits/spop_sum_meat.hpp | 1 - include/armadillo_bits/subview_bones.hpp | 146 +++++------ include/armadillo_bits/subview_cube_bones.hpp | 36 +-- .../armadillo_bits/subview_cube_each_meat.hpp | 1 - include/armadillo_bits/subview_cube_meat.hpp | 16 -- include/armadillo_bits/subview_each_meat.hpp | 1 - include/armadillo_bits/subview_meat.hpp | 69 ----- include/armadillo_bits/wall_clock_bones.hpp | 4 +- 68 files changed, 639 insertions(+), 1422 deletions(-) diff --git a/include/armadillo_bits/BaseCube_bones.hpp b/include/armadillo_bits/BaseCube_bones.hpp index 5e88a753..fe8f9ecf 100644 --- a/include/armadillo_bits/BaseCube_bones.hpp +++ b/include/armadillo_bits/BaseCube_bones.hpp @@ -24,14 +24,14 @@ template struct BaseCube_eval_Cube { - arma_inline arma_warn_unused const derived& eval() const; + arma_warn_unused arma_inline const derived& eval() const; }; template struct BaseCube_eval_expr { - inline arma_warn_unused Cube eval() const; //!< force the immediate evaluation of a delayed expression + arma_warn_unused inline Cube eval() const; //!< force the immediate evaluation of a delayed expression }; @@ -62,18 +62,18 @@ struct BaseCube arma_cold inline void brief_print( const std::string extra_text = "") const; arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const; - inline arma_warn_unused elem_type min() const; - inline arma_warn_unused elem_type max() const; + arma_warn_unused inline elem_type min() const; + arma_warn_unused inline elem_type max() const; - inline arma_warn_unused uword index_min() const; - inline arma_warn_unused uword index_max() const; + arma_warn_unused inline uword index_min() const; + arma_warn_unused inline uword index_max() const; - inline arma_warn_unused bool is_zero(const typename get_pod_type::result tol = 0) const; + arma_warn_unused inline bool is_zero(const typename get_pod_type::result tol = 0) const; - inline arma_warn_unused bool is_empty() const; - inline arma_warn_unused bool is_finite() const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; + arma_warn_unused inline bool is_empty() const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; }; diff --git a/include/armadillo_bits/BaseCube_meat.hpp b/include/armadillo_bits/BaseCube_meat.hpp index af7b3c30..5f00e132 100644 --- a/include/armadillo_bits/BaseCube_meat.hpp +++ b/include/armadillo_bits/BaseCube_meat.hpp @@ -32,7 +32,6 @@ BaseCube::get_ref() const template -arma_cold inline void BaseCube::print(const std::string extra_text) const @@ -56,7 +55,6 @@ BaseCube::print(const std::string extra_text) const template -arma_cold inline void BaseCube::print(std::ostream& user_stream, const std::string extra_text) const @@ -80,7 +78,6 @@ BaseCube::print(std::ostream& user_stream, const std::string template -arma_cold inline void BaseCube::raw_print(const std::string extra_text) const @@ -104,7 +101,6 @@ BaseCube::raw_print(const std::string extra_text) const template -arma_cold inline void BaseCube::raw_print(std::ostream& user_stream, const std::string extra_text) const @@ -128,7 +124,6 @@ BaseCube::raw_print(std::ostream& user_stream, const std::str template -arma_cold inline void BaseCube::brief_print(const std::string extra_text) const @@ -152,7 +147,6 @@ BaseCube::brief_print(const std::string extra_text) const template -arma_cold inline void BaseCube::brief_print(std::ostream& user_stream, const std::string extra_text) const @@ -177,7 +171,6 @@ BaseCube::brief_print(std::ostream& user_stream, const std::s template inline -arma_warn_unused elem_type BaseCube::min() const { @@ -188,7 +181,6 @@ BaseCube::min() const template inline -arma_warn_unused elem_type BaseCube::max() const { @@ -199,7 +191,6 @@ BaseCube::max() const template inline -arma_warn_unused uword BaseCube::index_min() const { @@ -223,7 +214,6 @@ BaseCube::index_min() const template inline -arma_warn_unused uword BaseCube::index_max() const { @@ -247,7 +237,6 @@ BaseCube::index_max() const template inline -arma_warn_unused bool BaseCube::is_zero(const typename get_pod_type::result tol) const { @@ -300,7 +289,6 @@ BaseCube::is_zero(const typename get_pod_type::res template inline -arma_warn_unused bool BaseCube::is_empty() const { @@ -315,7 +303,6 @@ BaseCube::is_empty() const template inline -arma_warn_unused bool BaseCube::is_finite() const { @@ -348,7 +335,6 @@ BaseCube::is_finite() const template inline -arma_warn_unused bool BaseCube::has_inf() const { @@ -381,7 +367,6 @@ BaseCube::has_inf() const template inline -arma_warn_unused bool BaseCube::has_nan() const { @@ -417,7 +402,6 @@ BaseCube::has_nan() const template arma_inline -arma_warn_unused const derived& BaseCube_eval_Cube::eval() const { @@ -433,7 +417,6 @@ BaseCube_eval_Cube::eval() const template inline -arma_warn_unused Cube BaseCube_eval_expr::eval() const { diff --git a/include/armadillo_bits/Base_bones.hpp b/include/armadillo_bits/Base_bones.hpp index 7620b00b..1029ecd0 100644 --- a/include/armadillo_bits/Base_bones.hpp +++ b/include/armadillo_bits/Base_bones.hpp @@ -24,10 +24,10 @@ template struct Base_extra_yes { - inline arma_warn_unused const Op i() const; //!< matrix inverse + arma_warn_unused inline const Op i() const; //!< matrix inverse - inline arma_warn_unused bool is_sympd() const; - inline arma_warn_unused bool is_sympd(typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_sympd() const; + arma_warn_unused inline bool is_sympd(typename get_pod_type::result tol) const; }; @@ -51,14 +51,14 @@ struct Base_extra { typedef Base_extra_no struct Base_eval_Mat { - arma_inline arma_warn_unused const derived& eval() const; + arma_warn_unused arma_inline const derived& eval() const; }; template struct Base_eval_expr { - inline arma_warn_unused Mat eval() const; //!< force the immediate evaluation of a delayed expression + arma_warn_unused inline Mat eval() const; //!< force the immediate evaluation of a delayed expression }; @@ -76,18 +76,18 @@ struct Base_eval { typedef Base_eval_expr struct Base_trans_cx { - arma_inline arma_warn_unused const Op t() const; - arma_inline arma_warn_unused const Op ht() const; - arma_inline arma_warn_unused const Op st() const; // simple transpose: no complex conjugates + arma_warn_unused arma_inline const Op t() const; + arma_warn_unused arma_inline const Op ht() const; + arma_warn_unused arma_inline const Op st() const; // simple transpose: no complex conjugates }; template struct Base_trans_default { - arma_inline arma_warn_unused const Op t() const; - arma_inline arma_warn_unused const Op ht() const; - arma_inline arma_warn_unused const Op st() const; // return op_htrans instead of op_strans, as it's handled better by matrix multiplication code + arma_warn_unused arma_inline const Op t() const; + arma_warn_unused arma_inline const Op ht() const; + arma_warn_unused arma_inline const Op st() const; // return op_htrans instead of op_strans, as it's handled better by matrix multiplication code }; @@ -124,8 +124,8 @@ struct Base arma_cold inline void brief_print( const std::string extra_text = "") const; arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const; - inline arma_warn_unused elem_type min() const; - inline arma_warn_unused elem_type max() const; + 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; @@ -133,31 +133,31 @@ struct Base 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; - inline arma_warn_unused uword index_min() const; - inline arma_warn_unused uword index_max() const; + arma_warn_unused inline uword index_min() const; + arma_warn_unused inline uword index_max() const; - inline arma_warn_unused bool is_symmetric() const; - inline arma_warn_unused bool is_symmetric(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_symmetric() const; + arma_warn_unused inline bool is_symmetric(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool is_hermitian() const; - inline arma_warn_unused bool is_hermitian(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_hermitian() const; + arma_warn_unused inline bool is_hermitian(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool is_zero(const typename get_pod_type::result tol = 0) const; + arma_warn_unused inline bool is_zero(const typename get_pod_type::result tol = 0) const; - inline arma_warn_unused bool is_trimatu() const; - inline arma_warn_unused bool is_trimatl() const; - inline arma_warn_unused bool is_diagmat() const; - inline arma_warn_unused bool is_empty() const; - inline arma_warn_unused bool is_square() const; - inline arma_warn_unused bool is_vec() const; - inline arma_warn_unused bool is_colvec() const; - inline arma_warn_unused bool is_rowvec() const; - inline arma_warn_unused bool is_finite() const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; + arma_warn_unused inline bool is_trimatu() const; + arma_warn_unused inline bool is_trimatl() const; + arma_warn_unused inline bool is_diagmat() const; + arma_warn_unused inline bool is_empty() const; + arma_warn_unused inline bool is_square() const; + arma_warn_unused inline bool is_vec() const; + arma_warn_unused inline bool is_colvec() const; + arma_warn_unused inline bool is_rowvec() const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; - inline arma_warn_unused const Op as_col() const; - inline arma_warn_unused const Op as_row() const; + arma_warn_unused inline const Op as_col() const; + arma_warn_unused inline const Op as_row() const; }; diff --git a/include/armadillo_bits/Base_meat.hpp b/include/armadillo_bits/Base_meat.hpp index 21c96689..77a7e30b 100644 --- a/include/armadillo_bits/Base_meat.hpp +++ b/include/armadillo_bits/Base_meat.hpp @@ -32,7 +32,6 @@ Base::get_ref() const template -arma_cold inline void Base::print(const std::string extra_text) const @@ -56,7 +55,6 @@ Base::print(const std::string extra_text) const template -arma_cold inline void Base::print(std::ostream& user_stream, const std::string extra_text) const @@ -80,7 +78,6 @@ Base::print(std::ostream& user_stream, const std::string extr template -arma_cold inline void Base::raw_print(const std::string extra_text) const @@ -104,7 +101,6 @@ Base::raw_print(const std::string extra_text) const template -arma_cold inline void Base::raw_print(std::ostream& user_stream, const std::string extra_text) const @@ -128,7 +124,6 @@ Base::raw_print(std::ostream& user_stream, const std::string template -arma_cold inline void Base::brief_print(const std::string extra_text) const @@ -152,7 +147,6 @@ Base::brief_print(const std::string extra_text) const template -arma_cold inline void Base::brief_print(std::ostream& user_stream, const std::string extra_text) const @@ -177,7 +171,6 @@ Base::brief_print(std::ostream& user_stream, const std::strin template inline -arma_warn_unused elem_type Base::min() const { @@ -188,7 +181,6 @@ Base::min() const template inline -arma_warn_unused elem_type Base::max() const { @@ -265,7 +257,6 @@ Base::max(uword& row_of_max_val, uword& col_of_max_val) const template inline -arma_warn_unused uword Base::index_min() const { @@ -289,7 +280,6 @@ Base::index_min() const template inline -arma_warn_unused uword Base::index_max() const { @@ -313,7 +303,6 @@ Base::index_max() const template inline -arma_warn_unused bool Base::is_symmetric() const { @@ -354,7 +343,6 @@ Base::is_symmetric() const template inline -arma_warn_unused bool Base::is_symmetric(const typename get_pod_type::result tol) const { @@ -386,7 +374,6 @@ Base::is_symmetric(const typename get_pod_type::re template inline -arma_warn_unused bool Base::is_hermitian() const { @@ -439,7 +426,6 @@ Base::is_hermitian() const template inline -arma_warn_unused bool Base::is_hermitian(const typename get_pod_type::result tol) const { @@ -471,7 +457,6 @@ Base::is_hermitian(const typename get_pod_type::re template inline -arma_warn_unused bool Base::is_zero(const typename get_pod_type::result tol) const { @@ -524,7 +509,6 @@ Base::is_zero(const typename get_pod_type::result template inline -arma_warn_unused bool Base::is_trimatu() const { @@ -543,7 +527,6 @@ Base::is_trimatu() const template inline -arma_warn_unused bool Base::is_trimatl() const { @@ -562,7 +545,6 @@ Base::is_trimatl() const template inline -arma_warn_unused bool Base::is_diagmat() const { @@ -602,7 +584,6 @@ Base::is_diagmat() const template inline -arma_warn_unused bool Base::is_empty() const { @@ -617,7 +598,6 @@ Base::is_empty() const template inline -arma_warn_unused bool Base::is_square() const { @@ -632,7 +612,6 @@ Base::is_square() const template inline -arma_warn_unused bool Base::is_vec() const { @@ -649,7 +628,6 @@ Base::is_vec() const template inline -arma_warn_unused bool Base::is_colvec() const { @@ -666,7 +644,6 @@ Base::is_colvec() const template inline -arma_warn_unused bool Base::is_rowvec() const { @@ -683,7 +660,6 @@ Base::is_rowvec() const template inline -arma_warn_unused bool Base::is_finite() const { @@ -728,7 +704,6 @@ Base::is_finite() const template inline -arma_warn_unused bool Base::has_inf() const { @@ -773,7 +748,6 @@ Base::has_inf() const template inline -arma_warn_unused bool Base::has_nan() const { @@ -818,7 +792,6 @@ Base::has_nan() const template inline -arma_warn_unused const Op Base::as_col() const { @@ -829,7 +802,6 @@ Base::as_col() const template inline -arma_warn_unused const Op Base::as_row() const { @@ -843,7 +815,6 @@ Base::as_row() const template inline -arma_warn_unused const Op Base_extra_yes::i() const { @@ -854,7 +825,6 @@ Base_extra_yes::i() const template inline -arma_warn_unused bool Base_extra_yes::is_sympd() const { @@ -880,7 +850,6 @@ Base_extra_yes::is_sympd() const template inline -arma_warn_unused bool Base_extra_yes::is_sympd(typename get_pod_type::result tol) const { @@ -908,7 +877,6 @@ Base_extra_yes::is_sympd(typename get_pod_type::re template arma_inline -arma_warn_unused const derived& Base_eval_Mat::eval() const { @@ -924,7 +892,6 @@ Base_eval_Mat::eval() const template inline -arma_warn_unused Mat Base_eval_expr::eval() const { @@ -940,7 +907,6 @@ Base_eval_expr::eval() const template arma_inline -arma_warn_unused const Op Base_trans_cx::t() const { @@ -951,7 +917,6 @@ Base_trans_cx::t() const template arma_inline -arma_warn_unused const Op Base_trans_cx::ht() const { @@ -962,7 +927,6 @@ Base_trans_cx::ht() const template arma_inline -arma_warn_unused const Op Base_trans_cx::st() const { @@ -976,7 +940,6 @@ Base_trans_cx::st() const template arma_inline -arma_warn_unused const Op Base_trans_default::t() const { @@ -987,7 +950,6 @@ Base_trans_default::t() const template arma_inline -arma_warn_unused const Op Base_trans_default::ht() const { @@ -998,7 +960,6 @@ Base_trans_default::ht() const template arma_inline -arma_warn_unused const Op Base_trans_default::st() const { diff --git a/include/armadillo_bits/Col_bones.hpp b/include/armadillo_bits/Col_bones.hpp index 6c1d99d0..fe07ca85 100644 --- a/include/armadillo_bits/Col_bones.hpp +++ b/include/armadillo_bits/Col_bones.hpp @@ -90,11 +90,11 @@ class Col : public Mat arma_frown("use braced initialiser list instead") inline mat_injector operator<<(const eT val); - arma_inline arma_warn_unused const Op,op_htrans> t() const; - arma_inline arma_warn_unused const Op,op_htrans> ht() const; - arma_inline arma_warn_unused const Op,op_strans> st() const; + arma_warn_unused arma_inline const Op,op_htrans> t() const; + arma_warn_unused arma_inline const Op,op_htrans> ht() const; + arma_warn_unused arma_inline const Op,op_strans> st() const; - arma_inline arma_warn_unused const Op,op_strans> as_row() const; + arma_warn_unused arma_inline const Op,op_strans> as_row() const; arma_inline subview_col row(const uword row_num); arma_inline const subview_col row(const uword row_num) const; @@ -144,11 +144,11 @@ class Col : public Mat template inline void insert_rows(const uword row_num, const Base& X); - arma_inline arma_warn_unused eT& at(const uword i); - arma_inline arma_warn_unused const eT& at(const uword i) const; + arma_warn_unused arma_inline eT& at(const uword i); + arma_warn_unused arma_inline const eT& at(const uword i) const; - arma_inline arma_warn_unused eT& at(const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at(const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at(const uword in_row, const uword in_col) const; typedef eT* row_iterator; @@ -237,26 +237,26 @@ class Col::fixed : public Col template inline Col& operator=(const eGlue& X); #endif - arma_inline arma_warn_unused const Op< Col_fixed_type, op_htrans > t() const; - arma_inline arma_warn_unused const Op< Col_fixed_type, op_htrans > ht() const; - arma_inline arma_warn_unused const Op< Col_fixed_type, op_strans > st() const; + arma_warn_unused arma_inline const Op< Col_fixed_type, op_htrans > t() const; + arma_warn_unused arma_inline const Op< Col_fixed_type, op_htrans > ht() const; + arma_warn_unused arma_inline const Op< Col_fixed_type, op_strans > st() const; - arma_inline arma_warn_unused const eT& at_alt (const uword i) const; + arma_warn_unused arma_inline const eT& at_alt (const uword i) const; - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused const eT& operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused const eT& at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused const eT& operator() (const uword i) const; + arma_warn_unused arma_inline eT& operator[] (const uword i); + arma_warn_unused arma_inline const eT& operator[] (const uword i) const; + arma_warn_unused arma_inline eT& at (const uword i); + arma_warn_unused arma_inline const eT& at (const uword i) const; + arma_warn_unused arma_inline eT& operator() (const uword i); + arma_warn_unused arma_inline const eT& operator() (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; + arma_warn_unused arma_inline eT* memptr(); + arma_warn_unused arma_inline const eT* memptr() const; arma_hot inline const Col& fill(const eT val); arma_hot inline const Col& zeros(); diff --git a/include/armadillo_bits/Col_meat.hpp b/include/armadillo_bits/Col_meat.hpp index ee06ceab..bf89926f 100644 --- a/include/armadillo_bits/Col_meat.hpp +++ b/include/armadillo_bits/Col_meat.hpp @@ -621,7 +621,6 @@ Col::operator<<(const eT val) template arma_inline -arma_warn_unused const Op,op_htrans> Col::t() const { @@ -632,7 +631,6 @@ Col::t() const template arma_inline -arma_warn_unused const Op,op_htrans> Col::ht() const { @@ -643,7 +641,6 @@ Col::ht() const template arma_inline -arma_warn_unused const Op,op_strans> Col::st() const { @@ -654,7 +651,6 @@ Col::st() const template arma_inline -arma_warn_unused const Op,op_strans> Col::as_row() const { @@ -1123,7 +1119,6 @@ Col::insert_rows(const uword row_num, const Base& X) template arma_inline -arma_warn_unused eT& Col::at(const uword i) { @@ -1134,7 +1129,6 @@ Col::at(const uword i) template arma_inline -arma_warn_unused const eT& Col::at(const uword i) const { @@ -1145,7 +1139,6 @@ Col::at(const uword i) const template arma_inline -arma_warn_unused eT& Col::at(const uword in_row, const uword) { @@ -1156,7 +1149,6 @@ Col::at(const uword in_row, const uword) template arma_inline -arma_warn_unused const eT& Col::at(const uword in_row, const uword) const { @@ -1577,7 +1569,6 @@ Col::fixed::operator=(const fixed& X) template template arma_inline -arma_warn_unused const Op< typename Col::template fixed::Col_fixed_type, op_htrans > Col::fixed::t() const { @@ -1589,7 +1580,6 @@ Col::fixed::t() const template template arma_inline -arma_warn_unused const Op< typename Col::template fixed::Col_fixed_type, op_htrans > Col::fixed::ht() const { @@ -1601,7 +1591,6 @@ Col::fixed::ht() const template template arma_inline -arma_warn_unused const Op< typename Col::template fixed::Col_fixed_type, op_strans > Col::fixed::st() const { @@ -1613,7 +1602,6 @@ Col::fixed::st() const template template arma_inline -arma_warn_unused const eT& Col::fixed::at_alt(const uword ii) const { @@ -1635,7 +1623,6 @@ Col::fixed::at_alt(const uword ii) const template template arma_inline -arma_warn_unused eT& Col::fixed::operator[] (const uword ii) { @@ -1647,7 +1634,6 @@ Col::fixed::operator[] (const uword ii) template template arma_inline -arma_warn_unused const eT& Col::fixed::operator[] (const uword ii) const { @@ -1659,7 +1645,6 @@ Col::fixed::operator[] (const uword ii) const template template arma_inline -arma_warn_unused eT& Col::fixed::at(const uword ii) { @@ -1671,7 +1656,6 @@ Col::fixed::at(const uword ii) template template arma_inline -arma_warn_unused const eT& Col::fixed::at(const uword ii) const { @@ -1683,7 +1667,6 @@ Col::fixed::at(const uword ii) const template template arma_inline -arma_warn_unused eT& Col::fixed::operator() (const uword ii) { @@ -1697,7 +1680,6 @@ Col::fixed::operator() (const uword ii) template template arma_inline -arma_warn_unused const eT& Col::fixed::operator() (const uword ii) const { @@ -1711,7 +1693,6 @@ Col::fixed::operator() (const uword ii) const template template arma_inline -arma_warn_unused eT& Col::fixed::at(const uword in_row, const uword) { @@ -1723,7 +1704,6 @@ Col::fixed::at(const uword in_row, const uword) template template arma_inline -arma_warn_unused const eT& Col::fixed::at(const uword in_row, const uword) const { @@ -1735,7 +1715,6 @@ Col::fixed::at(const uword in_row, const uword) const template template arma_inline -arma_warn_unused eT& Col::fixed::operator() (const uword in_row, const uword in_col) { @@ -1749,7 +1728,6 @@ Col::fixed::operator() (const uword in_row, const uword in_col template template arma_inline -arma_warn_unused const eT& Col::fixed::operator() (const uword in_row, const uword in_col) const { @@ -1763,7 +1741,6 @@ Col::fixed::operator() (const uword in_row, const uword in_col template template arma_inline -arma_warn_unused eT* Col::fixed::memptr() { @@ -1775,7 +1752,6 @@ Col::fixed::memptr() template template arma_inline -arma_warn_unused const eT* Col::fixed::memptr() const { @@ -1786,7 +1762,6 @@ Col::fixed::memptr() const template template -arma_hot inline const Col& Col::fixed::fill(const eT val) @@ -1804,7 +1779,6 @@ Col::fixed::fill(const eT val) template template -arma_hot inline const Col& Col::fixed::zeros() @@ -1822,7 +1796,6 @@ Col::fixed::zeros() template template -arma_hot inline const Col& Col::fixed::ones() diff --git a/include/armadillo_bits/Cube_bones.hpp b/include/armadillo_bits/Cube_bones.hpp index 0b0ba387..4e8630f1 100644 --- a/include/armadillo_bits/Cube_bones.hpp +++ b/include/armadillo_bits/Cube_bones.hpp @@ -282,27 +282,27 @@ class Cube : public BaseCube< eT, Cube > template inline Cube& operator/=(const mtGlueCube& X); - arma_inline arma_warn_unused const eT& at_alt (const uword i) const; + arma_warn_unused arma_inline const eT& at_alt (const uword i) const; - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused const eT& operator[] (const uword i) const; + arma_warn_unused arma_inline eT& operator[] (const uword i); + arma_warn_unused arma_inline const eT& operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at(const uword i); - arma_inline arma_warn_unused const eT& at(const uword i) const; + arma_warn_unused arma_inline eT& at(const uword i); + arma_warn_unused arma_inline const eT& at(const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused const eT& operator() (const uword i) const; + arma_warn_unused arma_inline eT& operator() (const uword i); + arma_warn_unused arma_inline const eT& operator() (const uword i) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const; #endif - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col, const uword in_slice) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const; arma_inline const Cube& operator++(); arma_inline void operator++(int); @@ -310,29 +310,29 @@ class Cube : public BaseCube< eT, Cube > arma_inline const Cube& operator--(); arma_inline void operator--(int); - inline arma_warn_unused bool is_finite() const; - arma_inline arma_warn_unused bool is_empty() const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused arma_inline bool is_empty() const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; - inline arma_warn_unused bool has_nonfinite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; + arma_warn_unused inline bool has_nonfinite() const; - arma_inline arma_warn_unused bool in_range(const uword i) const; - arma_inline arma_warn_unused bool in_range(const span& x) const; + arma_warn_unused arma_inline bool in_range(const uword i) const; + arma_warn_unused arma_inline bool in_range(const span& x) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice) const; - inline arma_warn_unused bool in_range(const span& row_span, const span& col_span, const span& slice_span) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused inline bool in_range(const span& row_span, const span& col_span, const span& slice_span) const; - inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const; + arma_warn_unused inline bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const; - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; + arma_warn_unused arma_inline eT* memptr(); + arma_warn_unused arma_inline const eT* memptr() const; - arma_inline arma_warn_unused eT* slice_memptr(const uword slice); - arma_inline arma_warn_unused const eT* slice_memptr(const uword slice) const; + arma_warn_unused arma_inline eT* slice_memptr(const uword slice); + arma_warn_unused arma_inline const eT* slice_memptr(const uword slice) const; - arma_inline arma_warn_unused eT* slice_colptr(const uword in_slice, const uword in_col); - arma_inline arma_warn_unused const eT* slice_colptr(const uword in_slice, const uword in_col) const; + arma_warn_unused arma_inline eT* slice_colptr(const uword in_slice, const uword in_col); + arma_warn_unused arma_inline const eT* slice_colptr(const uword in_slice, const uword in_col) const; inline void set_size(const uword new_n_rows, const uword new_n_cols, const uword new_n_slices); inline void set_size(const SizeCube& s); @@ -384,8 +384,8 @@ class Cube : public BaseCube< eT, Cube > template inline void set_imag(const BaseCube& X); - inline arma_warn_unused eT min() const; - inline arma_warn_unused eT max() const; + 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; @@ -394,13 +394,13 @@ class Cube : public BaseCube< eT, Cube > inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const; - inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const; - inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) 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; + arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool load(const std::string name, const file_type type = auto_detect); - inline arma_cold bool load(const hdf5_name& spec, const file_type type = hdf5_binary); - inline arma_cold bool load( std::istream& is, const file_type type = auto_detect); + arma_cold inline bool load(const std::string name, const file_type type = auto_detect); + arma_cold inline bool load(const hdf5_name& spec, const file_type type = hdf5_binary); + arma_cold inline bool load( std::istream& is, const file_type type = auto_detect); arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; arma_deprecated inline bool quiet_save(const hdf5_name& spec, const file_type type = hdf5_binary) const; @@ -437,11 +437,11 @@ class Cube : public BaseCube< eT, Cube > inline bool empty() const; inline uword size() const; - inline arma_warn_unused eT& front(); - inline arma_warn_unused const eT& front() const; + arma_warn_unused inline eT& front(); + arma_warn_unused inline const eT& front() const; - inline arma_warn_unused eT& back(); - inline arma_warn_unused const eT& back() const; + arma_warn_unused inline eT& back(); + arma_warn_unused inline const eT& back() const; inline void swap(Cube& B); @@ -513,25 +513,25 @@ class Cube::fixed : public Cube inline Cube& operator=(const fixed& X); - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused const eT& operator[] (const uword i) const; + arma_warn_unused arma_inline eT& operator[] (const uword i); + arma_warn_unused arma_inline const eT& operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused const eT& at (const uword i) const; + arma_warn_unused arma_inline eT& at (const uword i); + arma_warn_unused arma_inline const eT& at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused const eT& operator() (const uword i) const; + arma_warn_unused arma_inline eT& operator() (const uword i); + arma_warn_unused arma_inline const eT& operator() (const uword i) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col, const uword in_slice) const; #endif - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col, const uword in_slice) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col, const uword in_slice); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col, const uword in_slice); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col, const uword in_slice) const; }; diff --git a/include/armadillo_bits/Cube_meat.hpp b/include/armadillo_bits/Cube_meat.hpp index b94be0d2..75ad66a4 100644 --- a/include/armadillo_bits/Cube_meat.hpp +++ b/include/armadillo_bits/Cube_meat.hpp @@ -3414,7 +3414,6 @@ Cube::operator/=(const mtGlueCube& X) //! linear element accessor (treats the cube as a vector); no bounds check; assumes memory is aligned template arma_inline -arma_warn_unused const eT& Cube::at_alt(const uword i) const { @@ -3430,7 +3429,6 @@ Cube::at_alt(const uword i) const //! linear element accessor (treats the cube as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused eT& Cube::operator() (const uword i) { @@ -3444,7 +3442,6 @@ Cube::operator() (const uword i) //! linear element accessor (treats the cube as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const eT& Cube::operator() (const uword i) const { @@ -3457,7 +3454,6 @@ Cube::operator() (const uword i) const //! linear element accessor (treats the cube as a vector); no bounds check. template arma_inline -arma_warn_unused eT& Cube::operator[] (const uword i) { @@ -3469,7 +3465,6 @@ Cube::operator[] (const uword i) //! linear element accessor (treats the cube as a vector); no bounds check template arma_inline -arma_warn_unused const eT& Cube::operator[] (const uword i) const { @@ -3481,7 +3476,6 @@ Cube::operator[] (const uword i) const //! linear element accessor (treats the cube as a vector); no bounds check. template arma_inline -arma_warn_unused eT& Cube::at(const uword i) { @@ -3493,7 +3487,6 @@ Cube::at(const uword i) //! linear element accessor (treats the cube as a vector); no bounds check template arma_inline -arma_warn_unused const eT& Cube::at(const uword i) const { @@ -3505,7 +3498,6 @@ Cube::at(const uword i) const //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused eT& Cube::operator() (const uword in_row, const uword in_col, const uword in_slice) { @@ -3526,7 +3518,6 @@ Cube::operator() (const uword in_row, const uword in_col, const uword in_sli //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const eT& Cube::operator() (const uword in_row, const uword in_col, const uword in_slice) const { @@ -3549,8 +3540,7 @@ Cube::operator() (const uword in_row, const uword in_col, const uword in_sli //! element accessor; no bounds check template arma_inline - arma_warn_unused - eT& + eT& Cube::operator[] (const uword in_row, const uword in_col, const uword in_slice) { return access::rw( mem[in_slice*n_elem_slice + in_col*n_rows + in_row] ); @@ -3561,8 +3551,7 @@ Cube::operator() (const uword in_row, const uword in_col, const uword in_sli //! element accessor; no bounds check template arma_inline - arma_warn_unused - const eT& + const eT& Cube::operator[] (const uword in_row, const uword in_col, const uword in_slice) const { return mem[in_slice*n_elem_slice + in_col*n_rows + in_row]; @@ -3575,7 +3564,6 @@ Cube::operator() (const uword in_row, const uword in_col, const uword in_sli //! element accessor; no bounds check template arma_inline -arma_warn_unused eT& Cube::at(const uword in_row, const uword in_col, const uword in_slice) { @@ -3587,7 +3575,6 @@ Cube::at(const uword in_row, const uword in_col, const uword in_slice) //! element accessor; no bounds check template arma_inline -arma_warn_unused const eT& Cube::at(const uword in_row, const uword in_col, const uword in_slice) const { @@ -3646,7 +3633,6 @@ Cube::operator--(int) //! returns true if all of the elements are finite template inline -arma_warn_unused bool Cube::is_finite() const { @@ -3660,7 +3646,6 @@ Cube::is_finite() const //! returns true if the cube has no elements template arma_inline -arma_warn_unused bool Cube::is_empty() const { @@ -3671,7 +3656,6 @@ Cube::is_empty() const template inline -arma_warn_unused bool Cube::has_inf() const { @@ -3684,7 +3668,6 @@ Cube::has_inf() const template inline -arma_warn_unused bool Cube::has_nan() const { @@ -3697,7 +3680,6 @@ Cube::has_nan() const template inline -arma_warn_unused bool Cube::has_nonfinite() const { @@ -3711,7 +3693,6 @@ Cube::has_nonfinite() const //! returns true if the given index is currently in range template arma_inline -arma_warn_unused bool Cube::in_range(const uword i) const { @@ -3723,7 +3704,6 @@ Cube::in_range(const uword i) const //! returns true if the given start and end indices are currently in range template arma_inline -arma_warn_unused bool Cube::in_range(const span& x) const { @@ -3747,7 +3727,6 @@ Cube::in_range(const span& x) const //! returns true if the given location is currently in range template arma_inline -arma_warn_unused bool Cube::in_range(const uword in_row, const uword in_col, const uword in_slice) const { @@ -3758,7 +3737,6 @@ Cube::in_range(const uword in_row, const uword in_col, const uword in_slice) template inline -arma_warn_unused bool Cube::in_range(const span& row_span, const span& col_span, const span& slice_span) const { @@ -3786,7 +3764,6 @@ Cube::in_range(const span& row_span, const span& col_span, const span& slice template inline -arma_warn_unused bool Cube::in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const { @@ -3812,7 +3789,6 @@ Cube::in_range(const uword in_row, const uword in_col, const uword in_slice, //! returns a pointer to array of eTs used by the cube template arma_inline -arma_warn_unused eT* Cube::memptr() { @@ -3824,7 +3800,6 @@ Cube::memptr() //! returns a pointer to array of eTs used by the cube template arma_inline -arma_warn_unused const eT* Cube::memptr() const { @@ -3836,7 +3811,6 @@ Cube::memptr() const //! returns a pointer to array of eTs used by the specified slice in the cube template arma_inline -arma_warn_unused eT* Cube::slice_memptr(const uword uslice) { @@ -3848,7 +3822,6 @@ Cube::slice_memptr(const uword uslice) //! returns a pointer to array of eTs used by the specified slice in the cube template arma_inline -arma_warn_unused const eT* Cube::slice_memptr(const uword uslice) const { @@ -3860,7 +3833,6 @@ Cube::slice_memptr(const uword uslice) const //! returns a pointer to array of eTs used by the specified slice in the cube template arma_inline -arma_warn_unused eT* Cube::slice_colptr(const uword uslice, const uword col) { @@ -3872,7 +3844,6 @@ Cube::slice_colptr(const uword uslice, const uword col) //! returns a pointer to array of eTs used by the specified slice in the cube template arma_inline -arma_warn_unused const eT* Cube::slice_colptr(const uword uslice, const uword col) const { @@ -4387,7 +4358,6 @@ Cube::set_imag(const BaseCube::pod_type,T1>& X) template inline -arma_warn_unused eT Cube::min() const { @@ -4407,7 +4377,6 @@ Cube::min() const template inline -arma_warn_unused eT Cube::max() const { @@ -4540,7 +4509,6 @@ Cube::max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_ //! save the cube to a file template inline -arma_cold bool Cube::save(const std::string name, const file_type type) const { @@ -4592,7 +4560,6 @@ Cube::save(const std::string name, const file_type type) const template inline -arma_cold bool Cube::save(const hdf5_name& spec, const file_type type) const { @@ -4652,7 +4619,6 @@ Cube::save(const hdf5_name& spec, const file_type type) const //! save the cube to a stream template inline -arma_cold bool Cube::save(std::ostream& os, const file_type type) const { @@ -4697,7 +4663,6 @@ Cube::save(std::ostream& os, const file_type type) const //! load a cube from a file template inline -arma_cold bool Cube::load(const std::string name, const file_type type) { @@ -4766,7 +4731,6 @@ Cube::load(const std::string name, const file_type type) template inline -arma_cold bool Cube::load(const hdf5_name& spec, const file_type type) { @@ -4819,7 +4783,6 @@ Cube::load(const hdf5_name& spec, const file_type type) //! load a cube from a stream template inline -arma_cold bool Cube::load(std::istream& is, const file_type type) { @@ -5113,7 +5076,6 @@ Cube::size() const template inline -arma_warn_unused eT& Cube::front() { @@ -5126,7 +5088,6 @@ Cube::front() template inline -arma_warn_unused const eT& Cube::front() const { @@ -5139,7 +5100,6 @@ Cube::front() const template inline -arma_warn_unused eT& Cube::back() { @@ -5152,7 +5112,6 @@ Cube::back() template inline -arma_warn_unused const eT& Cube::back() const { @@ -5482,7 +5441,6 @@ Cube::fixed::operator=(const fix template template arma_inline -arma_warn_unused eT& Cube::fixed::operator[] (const uword i) { @@ -5494,7 +5452,6 @@ Cube::fixed::operator[] (const u template template arma_inline -arma_warn_unused const eT& Cube::fixed::operator[] (const uword i) const { @@ -5506,7 +5463,6 @@ Cube::fixed::operator[] (const u template template arma_inline -arma_warn_unused eT& Cube::fixed::at(const uword i) { @@ -5518,7 +5474,6 @@ Cube::fixed::at(const uword i) template template arma_inline -arma_warn_unused const eT& Cube::fixed::at(const uword i) const { @@ -5530,7 +5485,6 @@ Cube::fixed::at(const uword i) c template template arma_inline -arma_warn_unused eT& Cube::fixed::operator() (const uword i) { @@ -5544,7 +5498,6 @@ Cube::fixed::operator() (const u template template arma_inline -arma_warn_unused const eT& Cube::fixed::operator() (const uword i) const { @@ -5560,8 +5513,7 @@ Cube::fixed::operator() (const u template template arma_inline - arma_warn_unused - eT& + eT& Cube::fixed::operator[] (const uword in_row, const uword in_col, const uword in_slice) { const uword i = in_slice*fixed_n_elem_slice + in_col*fixed_n_rows + in_row; @@ -5574,8 +5526,7 @@ Cube::fixed::operator() (const u template template arma_inline - arma_warn_unused - const eT& + const eT& Cube::fixed::operator[] (const uword in_row, const uword in_col, const uword in_slice) const { const uword i = in_slice*fixed_n_elem_slice + in_col*fixed_n_rows + in_row; @@ -5590,7 +5541,6 @@ Cube::fixed::operator() (const u template template arma_inline -arma_warn_unused eT& Cube::fixed::at(const uword in_row, const uword in_col, const uword in_slice) { @@ -5604,7 +5554,6 @@ Cube::fixed::at(const uword in_r template template arma_inline -arma_warn_unused const eT& Cube::fixed::at(const uword in_row, const uword in_col, const uword in_slice) const { @@ -5618,7 +5567,6 @@ Cube::fixed::at(const uword in_r template template arma_inline -arma_warn_unused eT& Cube::fixed::operator() (const uword in_row, const uword in_col, const uword in_slice) { @@ -5641,7 +5589,6 @@ Cube::fixed::operator() (const u template template arma_inline -arma_warn_unused const eT& Cube::fixed::operator() (const uword in_row, const uword in_col, const uword in_slice) const { diff --git a/include/armadillo_bits/MapMat_bones.hpp b/include/armadillo_bits/MapMat_bones.hpp index 5d0eae99..7ab46b06 100644 --- a/include/armadillo_bits/MapMat_bones.hpp +++ b/include/armadillo_bits/MapMat_bones.hpp @@ -81,23 +81,23 @@ class MapMat inline void speye(const uword in_n_rows, const uword in_n_cols); inline void speye(const SizeMat& s); - arma_inline arma_warn_unused MapMat_val operator[](const uword index); - inline arma_warn_unused eT operator[](const uword index) const; + arma_warn_unused arma_inline MapMat_val operator[](const uword index); + arma_warn_unused inline eT operator[](const uword index) const; - arma_inline arma_warn_unused MapMat_val operator()(const uword index); - inline arma_warn_unused eT operator()(const uword index) const; + arma_warn_unused arma_inline MapMat_val operator()(const uword index); + arma_warn_unused inline eT operator()(const uword index) const; - arma_inline arma_warn_unused MapMat_val at(const uword in_row, const uword in_col); - inline arma_warn_unused eT at(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline MapMat_val at(const uword in_row, const uword in_col); + arma_warn_unused inline eT at(const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused MapMat_val operator()(const uword in_row, const uword in_col); - inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline MapMat_val operator()(const uword in_row, const uword in_col); + arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const; - inline arma_warn_unused bool is_empty() const; - inline arma_warn_unused bool is_vec() const; - inline arma_warn_unused bool is_rowvec() const; - inline arma_warn_unused bool is_colvec() const; - inline arma_warn_unused bool is_square() const; + arma_warn_unused inline bool is_empty() const; + arma_warn_unused inline bool is_vec() const; + arma_warn_unused inline bool is_rowvec() const; + arma_warn_unused inline bool is_colvec() const; + arma_warn_unused inline bool is_square() const; inline void sprandu(const uword in_n_rows, const uword in_n_cols, const double density); @@ -195,11 +195,11 @@ class SpMat_MapMat_val inline SpMat_MapMat_val& operator*=(const eT in_val); inline SpMat_MapMat_val& operator/=(const eT in_val); - inline SpMat_MapMat_val& operator++(); - inline arma_warn_unused eT operator++(int); + inline SpMat_MapMat_val& operator++(); + arma_warn_unused inline eT operator++(int); - inline SpMat_MapMat_val& operator--(); - inline arma_warn_unused eT operator--(int); + inline SpMat_MapMat_val& operator--(); + arma_warn_unused inline eT operator--(int); inline void set(const eT in_val); inline void add(const eT in_val); @@ -235,11 +235,11 @@ class SpSubview_MapMat_val : public SpMat_MapMat_val inline SpSubview_MapMat_val& operator*=(const eT in_val); inline SpSubview_MapMat_val& operator/=(const eT in_val); - inline SpSubview_MapMat_val& operator++(); - inline arma_warn_unused eT operator++(int); + inline SpSubview_MapMat_val& operator++(); + arma_warn_unused inline eT operator++(int); - inline SpSubview_MapMat_val& operator--(); - inline arma_warn_unused eT operator--(int); + inline SpSubview_MapMat_val& operator--(); + arma_warn_unused inline eT operator--(int); }; diff --git a/include/armadillo_bits/MapMat_meat.hpp b/include/armadillo_bits/MapMat_meat.hpp index 748bf5dd..e67a3072 100644 --- a/include/armadillo_bits/MapMat_meat.hpp +++ b/include/armadillo_bits/MapMat_meat.hpp @@ -408,7 +408,6 @@ MapMat::speye(const SizeMat& s) template arma_inline -arma_warn_unused MapMat_val MapMat::operator[](const uword index) { @@ -419,7 +418,6 @@ MapMat::operator[](const uword index) template inline -arma_warn_unused eT MapMat::operator[](const uword index) const { @@ -435,7 +433,6 @@ MapMat::operator[](const uword index) const template arma_inline -arma_warn_unused MapMat_val MapMat::operator()(const uword index) { @@ -448,7 +445,6 @@ MapMat::operator()(const uword index) template inline -arma_warn_unused eT MapMat::operator()(const uword index) const { @@ -466,7 +462,6 @@ MapMat::operator()(const uword index) const template arma_inline -arma_warn_unused MapMat_val MapMat::at(const uword in_row, const uword in_col) { @@ -479,7 +474,6 @@ MapMat::at(const uword in_row, const uword in_col) template inline -arma_warn_unused eT MapMat::at(const uword in_row, const uword in_col) const { @@ -497,7 +491,6 @@ MapMat::at(const uword in_row, const uword in_col) const template arma_inline -arma_warn_unused MapMat_val MapMat::operator()(const uword in_row, const uword in_col) { @@ -512,7 +505,6 @@ MapMat::operator()(const uword in_row, const uword in_col) template inline -arma_warn_unused eT MapMat::operator()(const uword in_row, const uword in_col) const { @@ -532,7 +524,6 @@ MapMat::operator()(const uword in_row, const uword in_col) const template inline -arma_warn_unused bool MapMat::is_empty() const { @@ -543,7 +534,6 @@ MapMat::is_empty() const template inline -arma_warn_unused bool MapMat::is_vec() const { @@ -554,7 +544,6 @@ MapMat::is_vec() const template inline -arma_warn_unused bool MapMat::is_rowvec() const { @@ -566,7 +555,6 @@ MapMat::is_rowvec() const //! returns true if the object can be interpreted as a column vector template inline -arma_warn_unused bool MapMat::is_colvec() const { @@ -577,7 +565,6 @@ MapMat::is_colvec() const template inline -arma_warn_unused bool MapMat::is_square() const { @@ -1343,7 +1330,6 @@ SpMat_MapMat_val::operator++() template inline -arma_warn_unused eT SpMat_MapMat_val::operator++(int) { @@ -1372,7 +1358,6 @@ SpMat_MapMat_val::operator--() template inline -arma_warn_unused eT SpMat_MapMat_val::operator--(int) { @@ -1735,7 +1720,6 @@ SpSubview_MapMat_val::operator++() template inline -arma_warn_unused eT SpSubview_MapMat_val::operator++(int) { @@ -1774,7 +1758,6 @@ SpSubview_MapMat_val::operator--() template inline -arma_warn_unused eT SpSubview_MapMat_val::operator--(int) { diff --git a/include/armadillo_bits/Mat_bones.hpp b/include/armadillo_bits/Mat_bones.hpp index 8311404d..b0c47f9c 100644 --- a/include/armadillo_bits/Mat_bones.hpp +++ b/include/armadillo_bits/Mat_bones.hpp @@ -72,11 +72,11 @@ class Mat : public Base< eT, Mat > inline Mat(const uword in_n_rows, const uword in_n_cols, const fill::scalar_holder f); inline Mat(const SizeMat& s, const fill::scalar_holder f); - inline arma_cold Mat(const char* text); - inline arma_cold Mat& operator=(const char* text); + arma_cold inline Mat(const char* text); + arma_cold inline Mat& operator=(const char* text); - inline arma_cold Mat(const std::string& text); - inline arma_cold Mat& operator=(const std::string& text); + arma_cold inline Mat(const std::string& text); + arma_cold inline Mat& operator=(const std::string& text); inline Mat(const std::vector& x); inline Mat& operator=(const std::vector& x); @@ -394,24 +394,24 @@ class Mat : public Base< eT, Mat > template inline Mat& operator/=(const mtGlue& X); - arma_inline arma_warn_unused const eT& at_alt (const uword ii) const; + arma_warn_unused arma_inline const eT& at_alt (const uword ii) const; - arma_inline arma_warn_unused eT& operator[] (const uword ii); - arma_inline arma_warn_unused const eT& operator[] (const uword ii) const; - arma_inline arma_warn_unused eT& at (const uword ii); - arma_inline arma_warn_unused const eT& at (const uword ii) const; - arma_inline arma_warn_unused eT& operator() (const uword ii); - arma_inline arma_warn_unused const eT& operator() (const uword ii) const; + arma_warn_unused arma_inline eT& operator[] (const uword ii); + arma_warn_unused arma_inline const eT& operator[] (const uword ii) const; + arma_warn_unused arma_inline eT& at (const uword ii); + arma_warn_unused arma_inline const eT& at (const uword ii) const; + arma_warn_unused arma_inline eT& operator() (const uword ii); + arma_warn_unused arma_inline const eT& operator() (const uword ii) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col) const; #endif - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const; arma_inline const Mat& operator++(); arma_inline void operator++(int); @@ -419,38 +419,38 @@ class Mat : public Base< eT, Mat > arma_inline const Mat& operator--(); arma_inline void operator--(int); - arma_inline arma_warn_unused bool is_empty() const; - arma_inline arma_warn_unused bool is_vec() const; - arma_inline arma_warn_unused bool is_rowvec() const; - arma_inline arma_warn_unused bool is_colvec() const; - arma_inline arma_warn_unused bool is_square() const; - inline arma_warn_unused bool is_finite() const; + arma_warn_unused arma_inline bool is_empty() const; + arma_warn_unused arma_inline bool is_vec() const; + arma_warn_unused arma_inline bool is_rowvec() const; + arma_warn_unused arma_inline bool is_colvec() const; + arma_warn_unused arma_inline bool is_square() const; + arma_warn_unused inline bool is_finite() const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; - inline arma_warn_unused bool has_nonfinite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; + arma_warn_unused inline bool has_nonfinite() const; - inline arma_warn_unused bool is_sorted(const char* direction = "ascend") const; - inline arma_warn_unused bool is_sorted(const char* direction, const uword dim) const; + arma_warn_unused inline bool is_sorted(const char* direction = "ascend") const; + arma_warn_unused inline bool is_sorted(const char* direction, const uword dim) const; template - inline arma_warn_unused bool is_sorted_helper(const comparator& comp, const uword dim) const; + arma_warn_unused inline bool is_sorted_helper(const comparator& comp, const uword dim) const; - arma_inline arma_warn_unused bool in_range(const uword ii) const; - arma_inline arma_warn_unused bool in_range(const span& x ) const; + arma_warn_unused arma_inline bool in_range(const uword ii) const; + arma_warn_unused arma_inline bool in_range(const span& x ) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; - arma_inline arma_warn_unused eT* colptr(const uword in_col); - arma_inline arma_warn_unused const eT* colptr(const uword in_col) const; + arma_warn_unused arma_inline eT* colptr(const uword in_col); + arma_warn_unused arma_inline const eT* colptr(const uword in_col) const; - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; + arma_warn_unused arma_inline eT* memptr(); + arma_warn_unused arma_inline const eT* memptr() const; template @@ -512,16 +512,16 @@ class Mat : public Base< eT, Mat > inline const Mat& eye(const uword new_n_rows, const uword new_n_cols); inline const Mat& eye(const SizeMat& s); - inline arma_cold void reset(); - inline arma_cold void soft_reset(); + arma_cold inline void reset(); + arma_cold inline void soft_reset(); template inline void set_real(const Base& X); template inline void set_imag(const Base& X); - inline arma_warn_unused eT min() const; - inline arma_warn_unused eT max() const; + 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; @@ -530,15 +530,15 @@ class Mat : public Base< eT, Mat > inline eT max(uword& row_of_max_val, uword& col_of_max_val) const; - inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const; - inline arma_cold bool save(const csv_name& spec, const file_type type = csv_ascii) const; - inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) 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; + arma_cold inline bool save(const csv_name& spec, const file_type type = csv_ascii) const; + arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool load(const std::string name, const file_type type = auto_detect); - inline arma_cold bool load(const hdf5_name& spec, const file_type type = hdf5_binary); - inline arma_cold bool load(const csv_name& spec, const file_type type = csv_ascii); - inline arma_cold bool load( std::istream& is, const file_type type = auto_detect); + arma_cold inline bool load(const std::string name, const file_type type = auto_detect); + arma_cold inline bool load(const hdf5_name& spec, const file_type type = hdf5_binary); + arma_cold inline bool load(const csv_name& spec, const file_type type = csv_ascii); + arma_cold inline bool load( std::istream& is, const file_type type = auto_detect); arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; arma_deprecated inline bool quiet_save(const hdf5_name& spec, const file_type type = hdf5_binary) const; @@ -572,18 +572,18 @@ class Mat : public Base< eT, Mat > inline row_iterator(const row_iterator& X); inline row_iterator(Mat& in_M, const uword in_row, const uword in_col); - inline arma_warn_unused eT& operator* (); + arma_warn_unused inline eT& operator* (); - inline row_iterator& operator++(); - inline arma_warn_unused row_iterator operator++(int); + inline row_iterator& operator++(); + arma_warn_unused inline row_iterator operator++(int); - inline row_iterator& operator--(); - inline arma_warn_unused row_iterator operator--(int); + inline row_iterator& operator--(); + arma_warn_unused inline row_iterator operator--(int); - inline arma_warn_unused bool operator!=(const row_iterator& X) const; - inline arma_warn_unused bool operator==(const row_iterator& X) const; - inline arma_warn_unused bool operator!=(const const_row_iterator& X) const; - inline arma_warn_unused bool operator==(const const_row_iterator& X) const; + arma_warn_unused inline bool operator!=(const row_iterator& X) const; + arma_warn_unused inline bool operator==(const row_iterator& X) const; + arma_warn_unused inline bool operator!=(const const_row_iterator& X) const; + arma_warn_unused inline bool operator==(const const_row_iterator& X) const; typedef std::bidirectional_iterator_tag iterator_category; typedef eT value_type; @@ -606,18 +606,18 @@ class Mat : public Base< eT, Mat > inline const_row_iterator(const const_row_iterator& X); inline const_row_iterator(const Mat& in_M, const uword in_row, const uword in_col); - inline arma_warn_unused const eT& operator*() const; + arma_warn_unused inline const eT& operator*() const; - inline const_row_iterator& operator++(); - inline arma_warn_unused const_row_iterator operator++(int); + inline const_row_iterator& operator++(); + arma_warn_unused inline const_row_iterator operator++(int); - inline const_row_iterator& operator--(); - inline arma_warn_unused const_row_iterator operator--(int); + inline const_row_iterator& operator--(); + arma_warn_unused inline const_row_iterator operator--(int); - inline arma_warn_unused bool operator!=(const row_iterator& X) const; - inline arma_warn_unused bool operator==(const row_iterator& X) const; - inline arma_warn_unused bool operator!=(const const_row_iterator& X) const; - inline arma_warn_unused bool operator==(const const_row_iterator& X) const; + arma_warn_unused inline bool operator!=(const row_iterator& X) const; + arma_warn_unused inline bool operator==(const row_iterator& X) const; + arma_warn_unused inline bool operator!=(const const_row_iterator& X) const; + arma_warn_unused inline bool operator==(const const_row_iterator& X) const; typedef std::bidirectional_iterator_tag iterator_category; typedef eT value_type; @@ -641,21 +641,21 @@ class Mat : public Base< eT, Mat > inline row_col_iterator(const row_col_iterator& in_it); inline row_col_iterator(Mat& in_M, const uword row = 0, const uword col = 0); - inline arma_warn_unused eT& operator*(); + arma_warn_unused inline eT& operator*(); - inline row_col_iterator& operator++(); - inline arma_warn_unused row_col_iterator operator++(int); + inline row_col_iterator& operator++(); + arma_warn_unused inline row_col_iterator operator++(int); - inline row_col_iterator& operator--(); - inline arma_warn_unused row_col_iterator operator--(int); + inline row_col_iterator& operator--(); + arma_warn_unused inline row_col_iterator operator--(int); - inline arma_warn_unused uword row() const; - inline arma_warn_unused uword col() const; + arma_warn_unused inline uword row() const; + arma_warn_unused inline uword col() const; - inline arma_warn_unused bool operator==(const row_col_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const row_col_iterator& rhs) const; - inline arma_warn_unused bool operator==(const const_row_col_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_row_col_iterator& rhs) const; + arma_warn_unused inline bool operator==(const row_col_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const row_col_iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_row_col_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_row_col_iterator& rhs) const; typedef std::bidirectional_iterator_tag iterator_category; typedef eT value_type; @@ -679,21 +679,21 @@ class Mat : public Base< eT, Mat > inline const_row_col_iterator(const const_row_col_iterator& in_it); inline const_row_col_iterator(const Mat& in_M, const uword row = 0, const uword col = 0); - inline arma_warn_unused const eT& operator*() const; + arma_warn_unused inline const eT& operator*() const; - inline const_row_col_iterator& operator++(); - inline arma_warn_unused const_row_col_iterator operator++(int); + inline const_row_col_iterator& operator++(); + arma_warn_unused inline const_row_col_iterator operator++(int); - inline const_row_col_iterator& operator--(); - inline arma_warn_unused const_row_col_iterator operator--(int); + inline const_row_col_iterator& operator--(); + arma_warn_unused inline const_row_col_iterator operator--(int); - inline arma_warn_unused uword row() const; - inline arma_warn_unused uword col() const; + arma_warn_unused inline uword row() const; + arma_warn_unused inline uword col() const; - inline arma_warn_unused bool operator==(const const_row_col_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_row_col_iterator& rhs) const; - inline arma_warn_unused bool operator==(const row_col_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const row_col_iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_row_col_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_row_col_iterator& rhs) const; + arma_warn_unused inline bool operator==(const row_col_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const row_col_iterator& rhs) const; // So that we satisfy the STL iterator types. typedef std::bidirectional_iterator_tag iterator_category; @@ -740,11 +740,11 @@ class Mat : public Base< eT, Mat > inline bool empty() const; inline uword size() const; - inline arma_warn_unused eT& front(); - inline arma_warn_unused const eT& front() const; + arma_warn_unused inline eT& front(); + arma_warn_unused inline const eT& front() const; - inline arma_warn_unused eT& back(); - inline arma_warn_unused const eT& back() const; + arma_warn_unused inline eT& back(); + arma_warn_unused inline const eT& back() const; inline void swap(Mat& B); @@ -762,7 +762,7 @@ class Mat : public Base< eT, Mat > inline void init_cold(); inline void init_warm(uword in_n_rows, uword in_n_cols); - inline arma_cold void init(const std::string& text); + arma_cold inline void init(const std::string& text); inline void init(const std::initializer_list& list); inline void init(const std::initializer_list< std::initializer_list >& list); @@ -854,36 +854,36 @@ class Mat::fixed : public Mat template inline Mat& operator=(const eGlue& X); #endif - arma_inline arma_warn_unused const Op< Mat_fixed_type, op_htrans > t() const; - arma_inline arma_warn_unused const Op< Mat_fixed_type, op_htrans > ht() const; - arma_inline arma_warn_unused const Op< Mat_fixed_type, op_strans > st() const; + arma_warn_unused arma_inline const Op< Mat_fixed_type, op_htrans > t() const; + arma_warn_unused arma_inline const Op< Mat_fixed_type, op_htrans > ht() const; + arma_warn_unused arma_inline const Op< Mat_fixed_type, op_strans > st() const; - arma_inline arma_warn_unused const eT& at_alt (const uword i) const; + arma_warn_unused arma_inline const eT& at_alt (const uword i) const; - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused const eT& operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused const eT& at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused const eT& operator() (const uword i) const; + arma_warn_unused arma_inline eT& operator[] (const uword i); + arma_warn_unused arma_inline const eT& operator[] (const uword i) const; + arma_warn_unused arma_inline eT& at (const uword i); + arma_warn_unused arma_inline const eT& at (const uword i) const; + arma_warn_unused arma_inline eT& operator() (const uword i); + arma_warn_unused arma_inline const eT& operator() (const uword i) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused eT& operator[] (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator[] (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator[] (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator[] (const uword in_row, const uword in_col) const; #endif - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT* colptr(const uword in_col); - arma_inline arma_warn_unused const eT* colptr(const uword in_col) const; + arma_warn_unused arma_inline eT* colptr(const uword in_col); + arma_warn_unused arma_inline const eT* colptr(const uword in_col) const; - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; + arma_warn_unused arma_inline eT* memptr(); + arma_warn_unused arma_inline const eT* memptr() const; - arma_inline arma_warn_unused bool is_vec() const; + arma_warn_unused arma_inline bool is_vec() const; inline const Mat& fill(const eT val); inline const Mat& zeros(); diff --git a/include/armadillo_bits/Mat_meat.hpp b/include/armadillo_bits/Mat_meat.hpp index 73d30604..90e7ff7b 100644 --- a/include/armadillo_bits/Mat_meat.hpp +++ b/include/armadillo_bits/Mat_meat.hpp @@ -457,7 +457,6 @@ Mat::init_warm(uword in_n_rows, uword in_n_cols) //! create the matrix from a textual description template inline -arma_cold Mat::Mat(const char* text) : n_rows(0) , n_cols(0) @@ -477,7 +476,6 @@ Mat::Mat(const char* text) //! create the matrix from a textual description template inline -arma_cold Mat& Mat::operator=(const char* text) { @@ -493,7 +491,6 @@ Mat::operator=(const char* text) //! create the matrix from a textual description template inline -arma_cold Mat::Mat(const std::string& text) : n_rows(0) , n_cols(0) @@ -513,7 +510,6 @@ Mat::Mat(const std::string& text) //! create the matrix from a textual description template inline -arma_cold Mat& Mat::operator=(const std::string& text) { @@ -529,7 +525,6 @@ Mat::operator=(const std::string& text) //! internal function to create the matrix from a textual description template inline -arma_cold void Mat::init(const std::string& text_orig) { @@ -5992,7 +5987,6 @@ Mat::operator/=(const mtGlue& X) //! linear element accessor (treats the matrix as a vector); no bounds check; assumes memory is aligned template arma_inline -arma_warn_unused const eT& Mat::at_alt(const uword ii) const { @@ -6008,7 +6002,6 @@ Mat::at_alt(const uword ii) const //! linear element accessor (treats the matrix as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused eT& Mat::operator() (const uword ii) { @@ -6022,7 +6015,6 @@ Mat::operator() (const uword ii) //! linear element accessor (treats the matrix as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const eT& Mat::operator() (const uword ii) const { @@ -6035,7 +6027,6 @@ Mat::operator() (const uword ii) const //! linear element accessor (treats the matrix as a vector); no bounds check. template arma_inline -arma_warn_unused eT& Mat::operator[] (const uword ii) { @@ -6047,7 +6038,6 @@ Mat::operator[] (const uword ii) //! linear element accessor (treats the matrix as a vector); no bounds check template arma_inline -arma_warn_unused const eT& Mat::operator[] (const uword ii) const { @@ -6059,7 +6049,6 @@ Mat::operator[] (const uword ii) const //! linear element accessor (treats the matrix as a vector); no bounds check. template arma_inline -arma_warn_unused eT& Mat::at(const uword ii) { @@ -6071,7 +6060,6 @@ Mat::at(const uword ii) //! linear element accessor (treats the matrix as a vector); no bounds check template arma_inline -arma_warn_unused const eT& Mat::at(const uword ii) const { @@ -6083,7 +6071,6 @@ Mat::at(const uword ii) const //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused eT& Mat::operator() (const uword in_row, const uword in_col) { @@ -6097,7 +6084,6 @@ Mat::operator() (const uword in_row, const uword in_col) //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const eT& Mat::operator() (const uword in_row, const uword in_col) const { @@ -6111,7 +6097,6 @@ Mat::operator() (const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline -arma_warn_unused eT& Mat::at(const uword in_row, const uword in_col) { @@ -6123,7 +6108,6 @@ Mat::at(const uword in_row, const uword in_col) //! element accessor; no bounds check template arma_inline -arma_warn_unused const eT& Mat::at(const uword in_row, const uword in_col) const { @@ -6137,8 +6121,7 @@ Mat::at(const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline - arma_warn_unused - eT& + eT& Mat::operator[] (const uword in_row, const uword in_col) { return access::rw( mem[in_row + in_col*n_rows] ); @@ -6149,8 +6132,7 @@ Mat::at(const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline - arma_warn_unused - const eT& + const eT& Mat::operator[] (const uword in_row, const uword in_col) const { return mem[in_row + in_col*n_rows]; @@ -6211,7 +6193,6 @@ Mat::operator--(int) //! returns true if the matrix has no elements template arma_inline -arma_warn_unused bool Mat::is_empty() const { @@ -6223,7 +6204,6 @@ Mat::is_empty() const //! returns true if the object can be interpreted as a column or row vector template arma_inline -arma_warn_unused bool Mat::is_vec() const { @@ -6235,7 +6215,6 @@ Mat::is_vec() const //! returns true if the object can be interpreted as a row vector template arma_inline -arma_warn_unused bool Mat::is_rowvec() const { @@ -6247,7 +6226,6 @@ Mat::is_rowvec() const //! returns true if the object can be interpreted as a column vector template arma_inline -arma_warn_unused bool Mat::is_colvec() const { @@ -6259,7 +6237,6 @@ Mat::is_colvec() const //! returns true if the object has the same number of non-zero rows and columnns template arma_inline -arma_warn_unused bool Mat::is_square() const { @@ -6271,7 +6248,6 @@ Mat::is_square() const //! returns true if all of the elements are finite template inline -arma_warn_unused bool Mat::is_finite() const { @@ -6282,7 +6258,6 @@ Mat::is_finite() const template inline -arma_warn_unused bool Mat::has_inf() const { @@ -6295,7 +6270,6 @@ Mat::has_inf() const template inline -arma_warn_unused bool Mat::has_nan() const { @@ -6308,7 +6282,6 @@ Mat::has_nan() const template inline -arma_warn_unused bool Mat::has_nonfinite() const { @@ -6321,7 +6294,6 @@ Mat::has_nonfinite() const template inline -arma_warn_unused bool Mat::is_sorted(const char* direction) const { @@ -6334,7 +6306,6 @@ Mat::is_sorted(const char* direction) const template inline -arma_warn_unused bool Mat::is_sorted(const char* direction, const uword dim) const { @@ -6410,7 +6381,6 @@ Mat::is_sorted(const char* direction, const uword dim) const template template inline -arma_warn_unused bool Mat::is_sorted_helper(const comparator& comp, const uword dim) const { @@ -6480,7 +6450,6 @@ Mat::is_sorted_helper(const comparator& comp, const uword dim) const //! returns true if the given index is currently in range template arma_inline -arma_warn_unused bool Mat::in_range(const uword ii) const { @@ -6492,7 +6461,6 @@ Mat::in_range(const uword ii) const //! returns true if the given start and end indices are currently in range template arma_inline -arma_warn_unused bool Mat::in_range(const span& x) const { @@ -6516,7 +6484,6 @@ Mat::in_range(const span& x) const //! returns true if the given location is currently in range template arma_inline -arma_warn_unused bool Mat::in_range(const uword in_row, const uword in_col) const { @@ -6527,7 +6494,6 @@ Mat::in_range(const uword in_row, const uword in_col) const template arma_inline -arma_warn_unused bool Mat::in_range(const span& row_span, const uword in_col) const { @@ -6550,7 +6516,6 @@ Mat::in_range(const span& row_span, const uword in_col) const template arma_inline -arma_warn_unused bool Mat::in_range(const uword in_row, const span& col_span) const { @@ -6573,7 +6538,6 @@ Mat::in_range(const uword in_row, const span& col_span) const template arma_inline -arma_warn_unused bool Mat::in_range(const span& row_span, const span& col_span) const { @@ -6595,7 +6559,6 @@ Mat::in_range(const span& row_span, const span& col_span) const template arma_inline -arma_warn_unused bool Mat::in_range(const uword in_row, const uword in_col, const SizeMat& s) const { @@ -6617,7 +6580,6 @@ Mat::in_range(const uword in_row, const uword in_col, const SizeMat& s) cons //! returns a pointer to array of eTs for a specified column; no bounds check template arma_inline -arma_warn_unused eT* Mat::colptr(const uword in_col) { @@ -6629,7 +6591,6 @@ Mat::colptr(const uword in_col) //! returns a pointer to array of eTs for a specified column; no bounds check template arma_inline -arma_warn_unused const eT* Mat::colptr(const uword in_col) const { @@ -6641,7 +6602,6 @@ Mat::colptr(const uword in_col) const //! returns a pointer to array of eTs used by the matrix template arma_inline -arma_warn_unused eT* Mat::memptr() { @@ -6653,7 +6613,6 @@ Mat::memptr() //! returns a pointer to array of eTs used by the matrix template arma_inline -arma_warn_unused const eT* Mat::memptr() const { @@ -7316,7 +7275,6 @@ Mat::eye(const SizeMat& s) template inline -arma_cold void Mat::reset() { @@ -7332,7 +7290,6 @@ Mat::reset() template inline -arma_cold void Mat::soft_reset() { @@ -7379,7 +7336,6 @@ Mat::set_imag(const Base::pod_type,T1>& X) template inline -arma_warn_unused eT Mat::min() const { @@ -7399,7 +7355,6 @@ Mat::min() const template inline -arma_warn_unused eT Mat::max() const { @@ -7520,7 +7475,6 @@ Mat::max(uword& row_of_max_val, uword& col_of_max_val) const //! save the matrix to a file template inline -arma_cold bool Mat::save(const std::string name, const file_type type) const { @@ -7584,7 +7538,6 @@ Mat::save(const std::string name, const file_type type) const template inline -arma_cold bool Mat::save(const hdf5_name& spec, const file_type type) const { @@ -7644,7 +7597,6 @@ Mat::save(const hdf5_name& spec, const file_type type) const template inline -arma_cold bool Mat::save(const csv_name& spec, const file_type type) const { @@ -7721,7 +7673,6 @@ Mat::save(const csv_name& spec, const file_type type) const //! save the matrix to a stream template inline -arma_cold bool Mat::save(std::ostream& os, const file_type type) const { @@ -7778,7 +7729,6 @@ Mat::save(std::ostream& os, const file_type type) const //! load a matrix from a file template inline -arma_cold bool Mat::load(const std::string name, const file_type type) { @@ -7859,7 +7809,6 @@ Mat::load(const std::string name, const file_type type) template inline -arma_cold bool Mat::load(const hdf5_name& spec, const file_type type) { @@ -7911,7 +7860,6 @@ Mat::load(const hdf5_name& spec, const file_type type) template inline -arma_cold bool Mat::load(const csv_name& spec, const file_type type) { @@ -8000,7 +7948,6 @@ Mat::load(const csv_name& spec, const file_type type) //! load a matrix from a stream template inline -arma_cold bool Mat::load(std::istream& is, const file_type type) { @@ -8207,7 +8154,6 @@ Mat::row_iterator::row_iterator(Mat& in_M, const uword in_row, const uwo template inline -arma_warn_unused eT& Mat::row_iterator::operator*() { @@ -8236,7 +8182,6 @@ Mat::row_iterator::operator++() template inline -arma_warn_unused typename Mat::row_iterator Mat::row_iterator::operator++(int) { @@ -8274,7 +8219,6 @@ Mat::row_iterator::operator--() template inline -arma_warn_unused typename Mat::row_iterator Mat::row_iterator::operator--(int) { @@ -8289,7 +8233,6 @@ Mat::row_iterator::operator--(int) template inline -arma_warn_unused bool Mat::row_iterator::operator!=(const typename Mat::row_iterator& X) const { @@ -8300,7 +8243,6 @@ Mat::row_iterator::operator!=(const typename Mat::row_iterator& X) const template inline -arma_warn_unused bool Mat::row_iterator::operator==(const typename Mat::row_iterator& X) const { @@ -8311,7 +8253,6 @@ Mat::row_iterator::operator==(const typename Mat::row_iterator& X) const template inline -arma_warn_unused bool Mat::row_iterator::operator!=(const typename Mat::const_row_iterator& X) const { @@ -8322,7 +8263,6 @@ Mat::row_iterator::operator!=(const typename Mat::const_row_iterator& X) template inline -arma_warn_unused bool Mat::row_iterator::operator==(const typename Mat::const_row_iterator& X) const { @@ -8383,7 +8323,6 @@ Mat::const_row_iterator::const_row_iterator(const Mat& in_M, const uword template inline -arma_warn_unused const eT& Mat::const_row_iterator::operator*() const { @@ -8412,7 +8351,6 @@ Mat::const_row_iterator::operator++() template inline -arma_warn_unused typename Mat::const_row_iterator Mat::const_row_iterator::operator++(int) { @@ -8450,7 +8388,6 @@ Mat::const_row_iterator::operator--() template inline -arma_warn_unused typename Mat::const_row_iterator Mat::const_row_iterator::operator--(int) { @@ -8465,7 +8402,6 @@ Mat::const_row_iterator::operator--(int) template inline -arma_warn_unused bool Mat::const_row_iterator::operator!=(const typename Mat::row_iterator& X) const { @@ -8476,7 +8412,6 @@ Mat::const_row_iterator::operator!=(const typename Mat::row_iterator& X) template inline -arma_warn_unused bool Mat::const_row_iterator::operator==(const typename Mat::row_iterator& X) const { @@ -8487,7 +8422,6 @@ Mat::const_row_iterator::operator==(const typename Mat::row_iterator& X) template inline -arma_warn_unused bool Mat::const_row_iterator::operator!=(const typename Mat::const_row_iterator& X) const { @@ -8498,7 +8432,6 @@ Mat::const_row_iterator::operator!=(const typename Mat::const_row_iterat template inline -arma_warn_unused bool Mat::const_row_iterator::operator==(const typename Mat::const_row_iterator& X) const { @@ -8549,7 +8482,6 @@ Mat::row_col_iterator::row_col_iterator(Mat& in_M, const uword in_row, c template inline -arma_warn_unused eT& Mat::row_col_iterator::operator*() { @@ -8583,7 +8515,6 @@ Mat::row_col_iterator::operator++() template inline -arma_warn_unused typename Mat::row_col_iterator Mat::row_col_iterator::operator++(int) { @@ -8620,7 +8551,6 @@ Mat::row_col_iterator::operator--() template inline -arma_warn_unused typename Mat::row_col_iterator Mat::row_col_iterator::operator--(int) { @@ -8635,7 +8565,6 @@ Mat::row_col_iterator::operator--(int) template inline -arma_warn_unused uword Mat::row_col_iterator::row() const { @@ -8646,7 +8575,6 @@ Mat::row_col_iterator::row() const template inline -arma_warn_unused uword Mat::row_col_iterator::col() const { @@ -8657,7 +8585,6 @@ Mat::row_col_iterator::col() const template inline -arma_warn_unused bool Mat::row_col_iterator::operator==(const row_col_iterator& rhs) const { @@ -8668,7 +8595,6 @@ Mat::row_col_iterator::operator==(const row_col_iterator& rhs) const template inline -arma_warn_unused bool Mat::row_col_iterator::operator!=(const row_col_iterator& rhs) const { @@ -8679,7 +8605,6 @@ Mat::row_col_iterator::operator!=(const row_col_iterator& rhs) const template inline -arma_warn_unused bool Mat::row_col_iterator::operator==(const const_row_col_iterator& rhs) const { @@ -8690,7 +8615,6 @@ Mat::row_col_iterator::operator==(const const_row_col_iterator& rhs) const template inline -arma_warn_unused bool Mat::row_col_iterator::operator!=(const const_row_col_iterator& rhs) const { @@ -8754,7 +8678,6 @@ Mat::const_row_col_iterator::const_row_col_iterator(const Mat& in_M, con template inline -arma_warn_unused const eT& Mat::const_row_col_iterator::operator*() const { @@ -8788,7 +8711,6 @@ Mat::const_row_col_iterator::operator++() template inline -arma_warn_unused typename Mat::const_row_col_iterator Mat::const_row_col_iterator::operator++(int) { @@ -8826,7 +8748,6 @@ Mat::const_row_col_iterator::operator--() template inline -arma_warn_unused typename Mat::const_row_col_iterator Mat::const_row_col_iterator::operator--(int) { @@ -8841,7 +8762,6 @@ Mat::const_row_col_iterator::operator--(int) template inline -arma_warn_unused uword Mat::const_row_col_iterator::row() const { @@ -8852,7 +8772,6 @@ Mat::const_row_col_iterator::row() const template inline -arma_warn_unused uword Mat::const_row_col_iterator::col() const { @@ -8863,7 +8782,6 @@ Mat::const_row_col_iterator::col() const template inline -arma_warn_unused bool Mat::const_row_col_iterator::operator==(const const_row_col_iterator& rhs) const { @@ -8874,7 +8792,6 @@ Mat::const_row_col_iterator::operator==(const const_row_col_iterator& rhs) c template inline -arma_warn_unused bool Mat::const_row_col_iterator::operator!=(const const_row_col_iterator& rhs) const { @@ -8885,7 +8802,6 @@ Mat::const_row_col_iterator::operator!=(const const_row_col_iterator& rhs) c template inline -arma_warn_unused bool Mat::const_row_col_iterator::operator==(const row_col_iterator& rhs) const { @@ -8896,7 +8812,6 @@ Mat::const_row_col_iterator::operator==(const row_col_iterator& rhs) const template inline -arma_warn_unused bool Mat::const_row_col_iterator::operator!=(const row_col_iterator& rhs) const { @@ -9162,7 +9077,6 @@ Mat::size() const template inline -arma_warn_unused eT& Mat::front() { @@ -9175,7 +9089,6 @@ Mat::front() template inline -arma_warn_unused const eT& Mat::front() const { @@ -9188,7 +9101,6 @@ Mat::front() const template inline -arma_warn_unused eT& Mat::back() { @@ -9201,7 +9113,6 @@ Mat::back() template inline -arma_warn_unused const eT& Mat::back() const { @@ -9512,7 +9423,6 @@ Mat::fixed::operator=(const fixed template arma_inline -arma_warn_unused const Op< typename Mat::template fixed::Mat_fixed_type, op_htrans > Mat::fixed::t() const { @@ -9524,7 +9434,6 @@ Mat::fixed::t() const template template arma_inline -arma_warn_unused const Op< typename Mat::template fixed::Mat_fixed_type, op_htrans > Mat::fixed::ht() const { @@ -9536,7 +9445,6 @@ Mat::fixed::ht() const template template arma_inline -arma_warn_unused const Op< typename Mat::template fixed::Mat_fixed_type, op_strans > Mat::fixed::st() const { @@ -9548,7 +9456,6 @@ Mat::fixed::st() const template template arma_inline -arma_warn_unused const eT& Mat::fixed::at_alt(const uword ii) const { @@ -9570,7 +9477,6 @@ Mat::fixed::at_alt(const uword ii) const template template arma_inline -arma_warn_unused eT& Mat::fixed::operator[] (const uword ii) { @@ -9582,7 +9488,6 @@ Mat::fixed::operator[] (const uword ii) template template arma_inline -arma_warn_unused const eT& Mat::fixed::operator[] (const uword ii) const { @@ -9594,7 +9499,6 @@ Mat::fixed::operator[] (const uword ii) const template template arma_inline -arma_warn_unused eT& Mat::fixed::at(const uword ii) { @@ -9606,7 +9510,6 @@ Mat::fixed::at(const uword ii) template template arma_inline -arma_warn_unused const eT& Mat::fixed::at(const uword ii) const { @@ -9618,7 +9521,6 @@ Mat::fixed::at(const uword ii) const template template arma_inline -arma_warn_unused eT& Mat::fixed::operator() (const uword ii) { @@ -9632,7 +9534,6 @@ Mat::fixed::operator() (const uword ii) template template arma_inline -arma_warn_unused const eT& Mat::fixed::operator() (const uword ii) const { @@ -9648,8 +9549,7 @@ Mat::fixed::operator() (const uword ii) const template template arma_inline - arma_warn_unused - eT& + eT& Mat::fixed::operator[] (const uword in_row, const uword in_col) { const uword iq = in_row + in_col*fixed_n_rows; @@ -9662,8 +9562,7 @@ Mat::fixed::operator() (const uword ii) const template template arma_inline - arma_warn_unused - const eT& + const eT& Mat::fixed::operator[] (const uword in_row, const uword in_col) const { const uword iq = in_row + in_col*fixed_n_rows; @@ -9678,7 +9577,6 @@ Mat::fixed::operator() (const uword ii) const template template arma_inline -arma_warn_unused eT& Mat::fixed::at(const uword in_row, const uword in_col) { @@ -9692,7 +9590,6 @@ Mat::fixed::at(const uword in_row, const uword i template template arma_inline -arma_warn_unused const eT& Mat::fixed::at(const uword in_row, const uword in_col) const { @@ -9706,7 +9603,6 @@ Mat::fixed::at(const uword in_row, const uword i template template arma_inline -arma_warn_unused eT& Mat::fixed::operator() (const uword in_row, const uword in_col) { @@ -9722,7 +9618,6 @@ Mat::fixed::operator() (const uword in_row, cons template template arma_inline -arma_warn_unused const eT& Mat::fixed::operator() (const uword in_row, const uword in_col) const { @@ -9738,7 +9633,6 @@ Mat::fixed::operator() (const uword in_row, cons template template arma_inline -arma_warn_unused eT* Mat::fixed::colptr(const uword in_col) { @@ -9752,7 +9646,6 @@ Mat::fixed::colptr(const uword in_col) template template arma_inline -arma_warn_unused const eT* Mat::fixed::colptr(const uword in_col) const { @@ -9766,7 +9659,6 @@ Mat::fixed::colptr(const uword in_col) const template template arma_inline -arma_warn_unused eT* Mat::fixed::memptr() { @@ -9778,7 +9670,6 @@ Mat::fixed::memptr() template template arma_inline -arma_warn_unused const eT* Mat::fixed::memptr() const { @@ -9790,7 +9681,6 @@ Mat::fixed::memptr() const template template arma_inline -arma_warn_unused bool Mat::fixed::is_vec() const { diff --git a/include/armadillo_bits/Row_bones.hpp b/include/armadillo_bits/Row_bones.hpp index 2b656cc9..76235dc1 100644 --- a/include/armadillo_bits/Row_bones.hpp +++ b/include/armadillo_bits/Row_bones.hpp @@ -90,11 +90,11 @@ class Row : public Mat arma_frown("use braced initialiser list instead") inline mat_injector operator<<(const eT val); - arma_inline arma_warn_unused const Op,op_htrans> t() const; - arma_inline arma_warn_unused const Op,op_htrans> ht() const; - arma_inline arma_warn_unused const Op,op_strans> st() const; + arma_warn_unused arma_inline const Op,op_htrans> t() const; + arma_warn_unused arma_inline const Op,op_htrans> ht() const; + arma_warn_unused arma_inline const Op,op_strans> st() const; - arma_inline arma_warn_unused const Op,op_strans> as_col() const; + arma_warn_unused arma_inline const Op,op_strans> as_col() const; arma_inline subview_row col(const uword col_num); arma_inline const subview_row col(const uword col_num) const; @@ -144,11 +144,11 @@ class Row : public Mat template inline void insert_cols(const uword col_num, const Base& X); - arma_inline arma_warn_unused eT& at(const uword i); - arma_inline arma_warn_unused const eT& at(const uword i) const; + arma_warn_unused arma_inline eT& at(const uword i); + arma_warn_unused arma_inline const eT& at(const uword i) const; - arma_inline arma_warn_unused eT& at(const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at(const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at(const uword in_row, const uword in_col) const; typedef eT* row_iterator; @@ -237,26 +237,26 @@ class Row::fixed : public Row template inline Row& operator=(const eGlue& X); #endif - arma_inline arma_warn_unused const Op< Row_fixed_type, op_htrans > t() const; - arma_inline arma_warn_unused const Op< Row_fixed_type, op_htrans > ht() const; - arma_inline arma_warn_unused const Op< Row_fixed_type, op_strans > st() const; + arma_warn_unused arma_inline const Op< Row_fixed_type, op_htrans > t() const; + arma_warn_unused arma_inline const Op< Row_fixed_type, op_htrans > ht() const; + arma_warn_unused arma_inline const Op< Row_fixed_type, op_strans > st() const; - arma_inline arma_warn_unused const eT& at_alt (const uword i) const; + arma_warn_unused arma_inline const eT& at_alt (const uword i) const; - arma_inline arma_warn_unused eT& operator[] (const uword i); - arma_inline arma_warn_unused const eT& operator[] (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword i); - arma_inline arma_warn_unused const eT& at (const uword i) const; - arma_inline arma_warn_unused eT& operator() (const uword i); - arma_inline arma_warn_unused const eT& operator() (const uword i) const; + arma_warn_unused arma_inline eT& operator[] (const uword i); + arma_warn_unused arma_inline const eT& operator[] (const uword i) const; + arma_warn_unused arma_inline eT& at (const uword i); + arma_warn_unused arma_inline const eT& at (const uword i) const; + arma_warn_unused arma_inline eT& operator() (const uword i); + arma_warn_unused arma_inline const eT& operator() (const uword i) const; - arma_inline arma_warn_unused eT& at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT& operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused const eT& operator() (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& at (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& at (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline eT& operator() (const uword in_row, const uword in_col); + arma_warn_unused arma_inline const eT& operator() (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused eT* memptr(); - arma_inline arma_warn_unused const eT* memptr() const; + arma_warn_unused arma_inline eT* memptr(); + arma_warn_unused arma_inline const eT* memptr() const; arma_hot inline const Row& fill(const eT val); arma_hot inline const Row& zeros(); diff --git a/include/armadillo_bits/Row_meat.hpp b/include/armadillo_bits/Row_meat.hpp index eeed4536..52f718e7 100644 --- a/include/armadillo_bits/Row_meat.hpp +++ b/include/armadillo_bits/Row_meat.hpp @@ -621,7 +621,6 @@ Row::operator<<(const eT val) template arma_inline -arma_warn_unused const Op,op_htrans> Row::t() const { @@ -632,7 +631,6 @@ Row::t() const template arma_inline -arma_warn_unused const Op,op_htrans> Row::ht() const { @@ -643,7 +641,6 @@ Row::ht() const template arma_inline -arma_warn_unused const Op,op_strans> Row::st() const { @@ -654,7 +651,6 @@ Row::st() const template arma_inline -arma_warn_unused const Op,op_strans> Row::as_col() const { @@ -1123,7 +1119,6 @@ Row::insert_cols(const uword col_num, const Base& X) template arma_inline -arma_warn_unused eT& Row::at(const uword i) { @@ -1134,7 +1129,6 @@ Row::at(const uword i) template arma_inline -arma_warn_unused const eT& Row::at(const uword i) const { @@ -1145,7 +1139,6 @@ Row::at(const uword i) const template arma_inline -arma_warn_unused eT& Row::at(const uword, const uword in_col) { @@ -1156,7 +1149,6 @@ Row::at(const uword, const uword in_col) template arma_inline -arma_warn_unused const eT& Row::at(const uword, const uword in_col) const { @@ -1577,7 +1569,6 @@ Row::fixed::operator=(const fixed& X) template template arma_inline -arma_warn_unused const Op< typename Row::template fixed::Row_fixed_type, op_htrans > Row::fixed::t() const { @@ -1589,7 +1580,6 @@ Row::fixed::t() const template template arma_inline -arma_warn_unused const Op< typename Row::template fixed::Row_fixed_type, op_htrans > Row::fixed::ht() const { @@ -1601,7 +1591,6 @@ Row::fixed::ht() const template template arma_inline -arma_warn_unused const Op< typename Row::template fixed::Row_fixed_type, op_strans > Row::fixed::st() const { @@ -1613,7 +1602,6 @@ Row::fixed::st() const template template arma_inline -arma_warn_unused const eT& Row::fixed::at_alt(const uword ii) const { @@ -1635,7 +1623,6 @@ Row::fixed::at_alt(const uword ii) const template template arma_inline -arma_warn_unused eT& Row::fixed::operator[] (const uword ii) { @@ -1647,7 +1634,6 @@ Row::fixed::operator[] (const uword ii) template template arma_inline -arma_warn_unused const eT& Row::fixed::operator[] (const uword ii) const { @@ -1659,7 +1645,6 @@ Row::fixed::operator[] (const uword ii) const template template arma_inline -arma_warn_unused eT& Row::fixed::at(const uword ii) { @@ -1671,7 +1656,6 @@ Row::fixed::at(const uword ii) template template arma_inline -arma_warn_unused const eT& Row::fixed::at(const uword ii) const { @@ -1683,7 +1667,6 @@ Row::fixed::at(const uword ii) const template template arma_inline -arma_warn_unused eT& Row::fixed::operator() (const uword ii) { @@ -1697,7 +1680,6 @@ Row::fixed::operator() (const uword ii) template template arma_inline -arma_warn_unused const eT& Row::fixed::operator() (const uword ii) const { @@ -1711,7 +1693,6 @@ Row::fixed::operator() (const uword ii) const template template arma_inline -arma_warn_unused eT& Row::fixed::at(const uword, const uword in_col) { @@ -1723,7 +1704,6 @@ Row::fixed::at(const uword, const uword in_col) template template arma_inline -arma_warn_unused const eT& Row::fixed::at(const uword, const uword in_col) const { @@ -1735,7 +1715,6 @@ Row::fixed::at(const uword, const uword in_col) const template template arma_inline -arma_warn_unused eT& Row::fixed::operator() (const uword in_row, const uword in_col) { @@ -1749,7 +1728,6 @@ Row::fixed::operator() (const uword in_row, const uword in_col template template arma_inline -arma_warn_unused const eT& Row::fixed::operator() (const uword in_row, const uword in_col) const { @@ -1763,7 +1741,6 @@ Row::fixed::operator() (const uword in_row, const uword in_col template template arma_inline -arma_warn_unused eT* Row::fixed::memptr() { @@ -1775,7 +1752,6 @@ Row::fixed::memptr() template template arma_inline -arma_warn_unused const eT* Row::fixed::memptr() const { @@ -1786,7 +1762,6 @@ Row::fixed::memptr() const template template -arma_hot inline const Row& Row::fixed::fill(const eT val) @@ -1804,7 +1779,6 @@ Row::fixed::fill(const eT val) template template -arma_hot inline const Row& Row::fixed::zeros() @@ -1822,7 +1796,6 @@ Row::fixed::zeros() template template -arma_hot inline const Row& Row::fixed::ones() diff --git a/include/armadillo_bits/SpBase_bones.hpp b/include/armadillo_bits/SpBase_bones.hpp index 40c3d402..696e6728 100644 --- a/include/armadillo_bits/SpBase_bones.hpp +++ b/include/armadillo_bits/SpBase_bones.hpp @@ -24,14 +24,14 @@ template struct SpBase_eval_SpMat { - inline arma_warn_unused const derived& eval() const; + arma_warn_unused inline const derived& eval() const; }; template struct SpBase_eval_expr { - inline arma_warn_unused SpMat eval() const; //!< force the immediate evaluation of a delayed expression + arma_warn_unused inline SpMat eval() const; //!< force the immediate evaluation of a delayed expression }; @@ -54,9 +54,9 @@ struct SpBase arma_inline bool is_alias(const SpMat& X) const; - inline arma_warn_unused const SpOp t() const; //!< Hermitian transpose - inline arma_warn_unused const SpOp ht() const; //!< Hermitian transpose - inline arma_warn_unused const SpOp st() const; //!< simple transpose + arma_warn_unused inline const SpOp t() const; //!< Hermitian transpose + arma_warn_unused inline const SpOp ht() const; //!< Hermitian transpose + arma_warn_unused inline const SpOp st() const; //!< simple transpose arma_cold inline void print( const std::string extra_text = "") const; arma_cold inline void print(std::ostream& user_stream, const std::string extra_text = "") const; @@ -73,8 +73,8 @@ struct SpBase arma_cold inline void brief_print( const std::string extra_text = "") const; arma_cold inline void brief_print(std::ostream& user_stream, const std::string extra_text = "") const; - inline arma_warn_unused elem_type min() const; - inline arma_warn_unused elem_type max() const; + 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; @@ -82,31 +82,31 @@ struct SpBase 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; - inline arma_warn_unused uword index_min() const; - inline arma_warn_unused uword index_max() const; + arma_warn_unused inline uword index_min() const; + arma_warn_unused inline uword index_max() const; - inline arma_warn_unused bool is_symmetric() const; - inline arma_warn_unused bool is_symmetric(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_symmetric() const; + arma_warn_unused inline bool is_symmetric(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool is_hermitian() const; - inline arma_warn_unused bool is_hermitian(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_hermitian() const; + arma_warn_unused inline bool is_hermitian(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool is_zero(const typename get_pod_type::result tol = 0) const; + arma_warn_unused inline bool is_zero(const typename get_pod_type::result tol = 0) const; - inline arma_warn_unused bool is_trimatu() const; - inline arma_warn_unused bool is_trimatl() const; - inline arma_warn_unused bool is_diagmat() const; - inline arma_warn_unused bool is_empty() const; - inline arma_warn_unused bool is_square() const; - inline arma_warn_unused bool is_vec() const; - inline arma_warn_unused bool is_colvec() const; - inline arma_warn_unused bool is_rowvec() const; - inline arma_warn_unused bool is_finite() const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; + arma_warn_unused inline bool is_trimatu() const; + arma_warn_unused inline bool is_trimatl() const; + arma_warn_unused inline bool is_diagmat() const; + arma_warn_unused inline bool is_empty() const; + arma_warn_unused inline bool is_square() const; + arma_warn_unused inline bool is_vec() const; + arma_warn_unused inline bool is_colvec() const; + arma_warn_unused inline bool is_rowvec() const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; - inline arma_warn_unused const SpOp as_col() const; - inline arma_warn_unused const SpOp as_row() const; + arma_warn_unused inline const SpOp as_col() const; + arma_warn_unused inline const SpOp as_row() const; }; diff --git a/include/armadillo_bits/SpBase_meat.hpp b/include/armadillo_bits/SpBase_meat.hpp index a0e6adbb..eced75ac 100644 --- a/include/armadillo_bits/SpBase_meat.hpp +++ b/include/armadillo_bits/SpBase_meat.hpp @@ -43,7 +43,6 @@ SpBase::is_alias(const SpMat& X) const template inline -arma_warn_unused const SpOp SpBase::t() const { @@ -53,7 +52,6 @@ SpBase::t() const template inline -arma_warn_unused const SpOp SpBase::ht() const { @@ -64,7 +62,6 @@ SpBase::ht() const template inline -arma_warn_unused const SpOp SpBase::st() const { @@ -74,7 +71,6 @@ SpBase::st() const template -arma_cold inline void SpBase::print(const std::string extra_text) const @@ -98,7 +94,6 @@ SpBase::print(const std::string extra_text) const template -arma_cold inline void SpBase::print(std::ostream& user_stream, const std::string extra_text) const @@ -122,7 +117,6 @@ SpBase::print(std::ostream& user_stream, const std::string ex template -arma_cold inline void SpBase::raw_print(const std::string extra_text) const @@ -146,7 +140,6 @@ SpBase::raw_print(const std::string extra_text) const template -arma_cold inline void SpBase::raw_print(std::ostream& user_stream, const std::string extra_text) const @@ -170,7 +163,6 @@ SpBase::raw_print(std::ostream& user_stream, const std::strin template -arma_cold inline void SpBase::print_dense(const std::string extra_text) const @@ -194,7 +186,6 @@ SpBase::print_dense(const std::string extra_text) const template -arma_cold inline void SpBase::print_dense(std::ostream& user_stream, const std::string extra_text) const @@ -218,7 +209,6 @@ SpBase::print_dense(std::ostream& user_stream, const std::st template -arma_cold inline void SpBase::raw_print_dense(const std::string extra_text) const @@ -242,7 +232,6 @@ SpBase::raw_print_dense(const std::string extra_text) const template -arma_cold inline void SpBase::raw_print_dense(std::ostream& user_stream, const std::string extra_text) const @@ -266,7 +255,6 @@ SpBase::raw_print_dense(std::ostream& user_stream, const std template -arma_cold inline void SpBase::brief_print(const std::string extra_text) const @@ -290,7 +278,6 @@ SpBase::brief_print(const std::string extra_text) const template -arma_cold inline void SpBase::brief_print(std::ostream& user_stream, const std::string extra_text) const @@ -318,7 +305,6 @@ SpBase::brief_print(std::ostream& user_stream, const std::str template inline -arma_warn_unused const derived& SpBase_eval_SpMat::eval() const { @@ -334,7 +320,6 @@ SpBase_eval_SpMat::eval() const template inline -arma_warn_unused SpMat SpBase_eval_expr::eval() const { @@ -347,7 +332,6 @@ SpBase_eval_expr::eval() const template inline -arma_warn_unused elem_type SpBase::min() const { @@ -358,7 +342,6 @@ SpBase::min() const template inline -arma_warn_unused elem_type SpBase::max() const { @@ -435,7 +418,6 @@ SpBase::max(uword& row_of_max_val, uword& col_of_max_val) co template inline -arma_warn_unused uword SpBase::index_min() const { @@ -459,7 +441,6 @@ SpBase::index_min() const template inline -arma_warn_unused uword SpBase::index_max() const { @@ -483,7 +464,6 @@ SpBase::index_max() const template inline -arma_warn_unused bool SpBase::is_symmetric() const { @@ -498,7 +478,6 @@ SpBase::is_symmetric() const template inline -arma_warn_unused bool SpBase::is_symmetric(const typename get_pod_type::result tol) const { @@ -513,7 +492,6 @@ SpBase::is_symmetric(const typename get_pod_type:: template inline -arma_warn_unused bool SpBase::is_hermitian() const { @@ -528,7 +506,6 @@ SpBase::is_hermitian() const template inline -arma_warn_unused bool SpBase::is_hermitian(const typename get_pod_type::result tol) const { @@ -543,7 +520,6 @@ SpBase::is_hermitian(const typename get_pod_type:: template inline -arma_warn_unused bool SpBase::is_zero(const typename get_pod_type::result tol) const { @@ -601,7 +577,6 @@ SpBase::is_zero(const typename get_pod_type::resul template inline -arma_warn_unused bool SpBase::is_trimatu() const { @@ -627,7 +602,6 @@ SpBase::is_trimatu() const template inline -arma_warn_unused bool SpBase::is_trimatl() const { @@ -653,7 +627,6 @@ SpBase::is_trimatl() const template inline -arma_warn_unused bool SpBase::is_diagmat() const { @@ -677,7 +650,6 @@ SpBase::is_diagmat() const template inline -arma_warn_unused bool SpBase::is_empty() const { @@ -692,7 +664,6 @@ SpBase::is_empty() const template inline -arma_warn_unused bool SpBase::is_square() const { @@ -707,7 +678,6 @@ SpBase::is_square() const template inline -arma_warn_unused bool SpBase::is_vec() const { @@ -724,7 +694,6 @@ SpBase::is_vec() const template inline -arma_warn_unused bool SpBase::is_colvec() const { @@ -741,7 +710,6 @@ SpBase::is_colvec() const template inline -arma_warn_unused bool SpBase::is_rowvec() const { @@ -758,7 +726,6 @@ SpBase::is_rowvec() const template inline -arma_warn_unused bool SpBase::is_finite() const { @@ -791,7 +758,6 @@ SpBase::is_finite() const template inline -arma_warn_unused bool SpBase::has_inf() const { @@ -824,7 +790,6 @@ SpBase::has_inf() const template inline -arma_warn_unused bool SpBase::has_nan() const { @@ -857,7 +822,6 @@ SpBase::has_nan() const template inline -arma_warn_unused const SpOp SpBase::as_col() const { @@ -868,7 +832,6 @@ SpBase::as_col() const template inline -arma_warn_unused const SpOp SpBase::as_row() const { diff --git a/include/armadillo_bits/SpCol_bones.hpp b/include/armadillo_bits/SpCol_bones.hpp index 24532e0d..b49f1a58 100644 --- a/include/armadillo_bits/SpCol_bones.hpp +++ b/include/armadillo_bits/SpCol_bones.hpp @@ -56,9 +56,9 @@ class SpCol : public SpMat template inline explicit SpCol(const SpBase& A, const SpBase& B); - inline arma_warn_unused const SpOp,spop_htrans> t() const; - inline arma_warn_unused const SpOp,spop_htrans> ht() const; - inline arma_warn_unused const SpOp,spop_strans> st() const; + arma_warn_unused inline const SpOp,spop_htrans> t() const; + arma_warn_unused inline const SpOp,spop_htrans> ht() const; + arma_warn_unused inline const SpOp,spop_strans> st() const; inline void shed_row (const uword row_num); inline void shed_rows(const uword in_row1, const uword in_row2); diff --git a/include/armadillo_bits/SpCol_meat.hpp b/include/armadillo_bits/SpCol_meat.hpp index 3d5cf66d..9b3c824e 100644 --- a/include/armadillo_bits/SpCol_meat.hpp +++ b/include/armadillo_bits/SpCol_meat.hpp @@ -204,7 +204,6 @@ SpCol::SpCol template inline -arma_warn_unused const SpOp,spop_htrans> SpCol::t() const { @@ -215,7 +214,6 @@ SpCol::t() const template inline -arma_warn_unused const SpOp,spop_htrans> SpCol::ht() const { @@ -226,7 +224,6 @@ SpCol::ht() const template inline -arma_warn_unused const SpOp,spop_strans> SpCol::st() const { diff --git a/include/armadillo_bits/SpMat_bones.hpp b/include/armadillo_bits/SpMat_bones.hpp index 883ccf82..63b9810b 100644 --- a/include/armadillo_bits/SpMat_bones.hpp +++ b/include/armadillo_bits/SpMat_bones.hpp @@ -274,54 +274,54 @@ class SpMat : public SpBase< eT, SpMat > // access the i-th element; if there is nothing at element i, 0 is returned - arma_inline arma_warn_unused SpMat_MapMat_val operator[] (const uword i); - arma_inline arma_warn_unused eT operator[] (const uword i) const; + arma_warn_unused arma_inline SpMat_MapMat_val operator[] (const uword i); + arma_warn_unused arma_inline eT operator[] (const uword i) const; - arma_inline arma_warn_unused SpMat_MapMat_val at (const uword i); - arma_inline arma_warn_unused eT at (const uword i) const; + arma_warn_unused arma_inline SpMat_MapMat_val at (const uword i); + arma_warn_unused arma_inline eT at (const uword i) const; - arma_inline arma_warn_unused SpMat_MapMat_val operator() (const uword i); - arma_inline arma_warn_unused eT operator() (const uword i) const; + arma_warn_unused arma_inline SpMat_MapMat_val operator() (const uword i); + arma_warn_unused arma_inline eT operator() (const uword i) const; // access the element at the given row and column; if there is nothing at that position, 0 is returned #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused SpMat_MapMat_val operator[] (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT operator[] (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline SpMat_MapMat_val operator[] (const uword in_row, const uword in_col); + arma_warn_unused arma_inline eT operator[] (const uword in_row, const uword in_col) const; #endif - arma_inline arma_warn_unused SpMat_MapMat_val at (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT at (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline SpMat_MapMat_val at (const uword in_row, const uword in_col); + arma_warn_unused arma_inline eT at (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused SpMat_MapMat_val operator() (const uword in_row, const uword in_col); - arma_inline arma_warn_unused eT operator() (const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline SpMat_MapMat_val operator() (const uword in_row, const uword in_col); + arma_warn_unused arma_inline eT operator() (const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused bool is_empty() const; - arma_inline arma_warn_unused bool is_vec() const; - arma_inline arma_warn_unused bool is_rowvec() const; - arma_inline arma_warn_unused bool is_colvec() const; - arma_inline arma_warn_unused bool is_square() const; - inline arma_warn_unused bool is_finite() const; + arma_warn_unused arma_inline bool is_empty() const; + arma_warn_unused arma_inline bool is_vec() const; + arma_warn_unused arma_inline bool is_rowvec() const; + arma_warn_unused arma_inline bool is_colvec() const; + arma_warn_unused arma_inline bool is_square() const; + arma_warn_unused inline bool is_finite() const; - inline arma_warn_unused bool is_symmetric() const; - inline arma_warn_unused bool is_symmetric(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_symmetric() const; + arma_warn_unused inline bool is_symmetric(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool is_hermitian() const; - inline arma_warn_unused bool is_hermitian(const typename get_pod_type::result tol) const; + arma_warn_unused inline bool is_hermitian() const; + arma_warn_unused inline bool is_hermitian(const typename get_pod_type::result tol) const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; - inline arma_warn_unused bool has_nonfinite() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; + arma_warn_unused inline bool has_nonfinite() const; - arma_inline arma_warn_unused bool in_range(const uword i) const; - arma_inline arma_warn_unused bool in_range(const span& x) const; + arma_warn_unused arma_inline bool in_range(const uword i) const; + arma_warn_unused arma_inline bool in_range(const span& x) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; template inline void copy_size(const SpMat& m); @@ -390,13 +390,13 @@ class SpMat : public SpBase< eT, SpMat > // saving and loading // TODO: implement auto_detect for sparse matrices - inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool save(const csv_name& spec, const file_type type = csv_ascii) const; - inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const; + arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const; + arma_cold inline bool save(const csv_name& spec, const file_type type = csv_ascii) const; + arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool load(const std::string name, const file_type type = arma_binary); - inline arma_cold bool load(const csv_name& spec, const file_type type = csv_ascii); - inline arma_cold bool load( std::istream& is, const file_type type = arma_binary); + arma_cold inline bool load(const std::string name, const file_type type = arma_binary); + arma_cold inline bool load(const csv_name& spec, const file_type type = csv_ascii); + arma_cold inline bool load( std::istream& is, const file_type type = arma_binary); arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; arma_deprecated inline bool quiet_save( std::ostream& os, const file_type type = arma_binary) const; @@ -453,23 +453,23 @@ class SpMat : public SpBase< eT, SpMat > inline const_iterator(const const_iterator& other); inline const_iterator& operator= (const const_iterator& other) = default; - inline arma_hot const_iterator& operator++(); - inline arma_warn_unused const_iterator operator++(int); + arma_hot inline const_iterator& operator++(); + arma_warn_unused inline const_iterator operator++(int); - inline arma_hot const_iterator& operator--(); - inline arma_warn_unused const_iterator operator--(int); + arma_hot inline const_iterator& operator--(); + arma_warn_unused inline const_iterator operator--(int); - inline arma_hot bool operator==(const const_iterator& rhs) const; - inline arma_hot bool operator!=(const const_iterator& rhs) const; + arma_hot inline bool operator==(const const_iterator& rhs) const; + arma_hot inline bool operator!=(const const_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpSubview::const_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpSubview::const_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpSubview::const_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpSubview::const_iterator& rhs) const; - inline arma_hot bool operator==(const const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const const_row_iterator& rhs) const; + arma_hot inline bool operator==(const const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const const_row_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpSubview::const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpSubview::const_row_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpSubview::const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpSubview::const_row_iterator& rhs) const; }; /** @@ -490,14 +490,14 @@ class SpMat : public SpBase< eT, SpMat > inline iterator (const iterator& other) : const_iterator(other) { } inline iterator& operator=(const iterator& other) = default; - inline arma_hot SpValProxy< SpMat > operator*(); + arma_hot inline SpValProxy< SpMat > operator*(); // overloads needed for return type correctness - inline arma_hot iterator& operator++(); - inline arma_warn_unused iterator operator++(int); + arma_hot inline iterator& operator++(); + arma_warn_unused inline iterator operator++(int); - inline arma_hot iterator& operator--(); - inline arma_warn_unused iterator operator--(int); + arma_hot inline iterator& operator--(); + arma_warn_unused inline iterator operator--(int); // this has a different value_type than iterator_base typedef SpValProxy< SpMat > value_type; @@ -516,11 +516,11 @@ class SpMat : public SpBase< eT, SpMat > inline const_row_iterator(const const_row_iterator& other); inline const_row_iterator& operator= (const const_row_iterator& other) = default; - inline arma_hot const_row_iterator& operator++(); - inline arma_warn_unused const_row_iterator operator++(int); + arma_hot inline const_row_iterator& operator++(); + arma_warn_unused inline const_row_iterator operator++(int); - inline arma_hot const_row_iterator& operator--(); - inline arma_warn_unused const_row_iterator operator--(int); + arma_hot inline const_row_iterator& operator--(); + arma_warn_unused inline const_row_iterator operator--(int); uword internal_row; // hold row internally uword actual_pos; // hold the true position we are at in the matrix, as column-major indexing @@ -529,17 +529,17 @@ class SpMat : public SpBase< eT, SpMat > arma_inline uword row() const { return internal_row; } - inline arma_hot bool operator==(const const_iterator& rhs) const; - inline arma_hot bool operator!=(const const_iterator& rhs) const; + arma_hot inline bool operator==(const const_iterator& rhs) const; + arma_hot inline bool operator!=(const const_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpSubview::const_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpSubview::const_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpSubview::const_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpSubview::const_iterator& rhs) const; - inline arma_hot bool operator==(const const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const const_row_iterator& rhs) const; + arma_hot inline bool operator==(const const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const const_row_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpSubview::const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpSubview::const_row_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpSubview::const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpSubview::const_row_iterator& rhs) const; }; class row_iterator : public const_row_iterator @@ -554,14 +554,14 @@ class SpMat : public SpBase< eT, SpMat > inline row_iterator(const row_iterator& other) : const_row_iterator(other) { } inline row_iterator& operator= (const row_iterator& other) = default; - inline arma_hot SpValProxy< SpMat > operator*(); + arma_hot inline SpValProxy< SpMat > operator*(); // overloads required for return type correctness - inline arma_hot row_iterator& operator++(); - inline arma_warn_unused row_iterator operator++(int); + arma_hot inline row_iterator& operator++(); + arma_warn_unused inline row_iterator operator++(int); - inline arma_hot row_iterator& operator--(); - inline arma_warn_unused row_iterator operator--(int); + arma_hot inline row_iterator& operator--(); + arma_warn_unused inline row_iterator operator--(int); // this has a different value_type than iterator_base typedef SpValProxy< SpMat > value_type; @@ -617,11 +617,11 @@ class SpMat : public SpBase< eT, SpMat > inline bool empty() const; inline uword size() const; - arma_inline arma_warn_unused SpMat_MapMat_val front(); - arma_inline arma_warn_unused eT front() const; + arma_warn_unused arma_inline SpMat_MapMat_val front(); + arma_warn_unused arma_inline eT front() const; - arma_inline arma_warn_unused SpMat_MapMat_val back(); - arma_inline arma_warn_unused eT back() const; + arma_warn_unused arma_inline SpMat_MapMat_val back(); + arma_warn_unused arma_inline eT back() const; // Resize memory. // If the new size is larger, the column pointers and new memory still need to be correctly set. @@ -651,8 +651,8 @@ class SpMat : public SpBase< eT, SpMat > protected: - inline void init(uword in_rows, uword in_cols, const uword new_n_nonzero = 0); - inline void arma_cold init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero = 0); + inline void init(uword in_rows, uword in_cols, const uword new_n_nonzero = 0); + arma_cold inline void init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero = 0); inline void init(const std::string& text); inline void init(const SpMat& x); @@ -669,22 +669,22 @@ class SpMat : public SpBase< eT, SpMat > private: - inline arma_hot arma_warn_unused const eT* find_value_csc(const uword in_row, const uword in_col) const; + arma_warn_unused arma_hot inline const eT* find_value_csc(const uword in_row, const uword in_col) const; - inline arma_hot arma_warn_unused eT get_value(const uword i ) const; - inline arma_hot arma_warn_unused eT get_value(const uword in_row, const uword in_col) const; + arma_warn_unused arma_hot inline eT get_value(const uword i ) const; + arma_warn_unused arma_hot inline eT get_value(const uword in_row, const uword in_col) const; - inline arma_hot arma_warn_unused eT get_value_csc(const uword i ) const; - inline arma_hot arma_warn_unused eT get_value_csc(const uword in_row, const uword in_col) const; + arma_warn_unused arma_hot inline eT get_value_csc(const uword i ) const; + arma_warn_unused arma_hot inline eT get_value_csc(const uword in_row, const uword in_col) const; - inline arma_hot arma_warn_unused bool try_set_value_csc(const uword in_row, const uword in_col, const eT in_val); - inline arma_hot arma_warn_unused bool try_add_value_csc(const uword in_row, const uword in_col, const eT in_val); - inline arma_hot arma_warn_unused bool try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val); - inline arma_hot arma_warn_unused bool try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val); - inline arma_hot arma_warn_unused bool try_div_value_csc(const uword in_row, const uword in_col, const eT in_val); + arma_warn_unused arma_hot inline bool try_set_value_csc(const uword in_row, const uword in_col, const eT in_val); + arma_warn_unused arma_hot inline bool try_add_value_csc(const uword in_row, const uword in_col, const eT in_val); + arma_warn_unused arma_hot inline bool try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val); + arma_warn_unused arma_hot inline bool try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val); + arma_warn_unused arma_hot inline bool try_div_value_csc(const uword in_row, const uword in_col, const eT in_val); - inline arma_warn_unused eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0)); - inline void delete_element(const uword in_row, const uword in_col); + arma_warn_unused inline eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0)); + inline void delete_element(const uword in_row, const uword in_col); // cache related diff --git a/include/armadillo_bits/SpMat_iterators_meat.hpp b/include/armadillo_bits/SpMat_iterators_meat.hpp index 93d0d9e4..ed29640d 100644 --- a/include/armadillo_bits/SpMat_iterators_meat.hpp +++ b/include/armadillo_bits/SpMat_iterators_meat.hpp @@ -150,7 +150,6 @@ SpMat::const_iterator::const_iterator(const typename SpMat::const_iterat template inline -arma_hot typename SpMat::const_iterator& SpMat::const_iterator::operator++() { @@ -175,7 +174,6 @@ SpMat::const_iterator::operator++() template inline -arma_warn_unused typename SpMat::const_iterator SpMat::const_iterator::operator++(int) { @@ -190,7 +188,6 @@ SpMat::const_iterator::operator++(int) template inline -arma_hot typename SpMat::const_iterator& SpMat::const_iterator::operator--() { @@ -209,7 +206,6 @@ SpMat::const_iterator::operator--() template inline -arma_warn_unused typename SpMat::const_iterator SpMat::const_iterator::operator--(int) { @@ -224,7 +220,6 @@ SpMat::const_iterator::operator--(int) template inline -arma_hot bool SpMat::const_iterator::operator==(const const_iterator& rhs) const { @@ -235,7 +230,6 @@ SpMat::const_iterator::operator==(const const_iterator& rhs) const template inline -arma_hot bool SpMat::const_iterator::operator!=(const const_iterator& rhs) const { @@ -246,7 +240,6 @@ SpMat::const_iterator::operator!=(const const_iterator& rhs) const template inline -arma_hot bool SpMat::const_iterator::operator==(const typename SpSubview::const_iterator& rhs) const { @@ -257,7 +250,6 @@ SpMat::const_iterator::operator==(const typename SpSubview::const_iterat template inline -arma_hot bool SpMat::const_iterator::operator!=(const typename SpSubview::const_iterator& rhs) const { @@ -268,7 +260,6 @@ SpMat::const_iterator::operator!=(const typename SpSubview::const_iterat template inline -arma_hot bool SpMat::const_iterator::operator==(const const_row_iterator& rhs) const { @@ -279,7 +270,6 @@ SpMat::const_iterator::operator==(const const_row_iterator& rhs) const template inline -arma_hot bool SpMat::const_iterator::operator!=(const const_row_iterator& rhs) const { @@ -290,7 +280,6 @@ SpMat::const_iterator::operator!=(const const_row_iterator& rhs) const template inline -arma_hot bool SpMat::const_iterator::operator==(const typename SpSubview::const_row_iterator& rhs) const { @@ -301,7 +290,6 @@ SpMat::const_iterator::operator==(const typename SpSubview::const_row_it template inline -arma_hot bool SpMat::const_iterator::operator!=(const typename SpSubview::const_row_iterator& rhs) const { @@ -316,7 +304,6 @@ SpMat::const_iterator::operator!=(const typename SpSubview::const_row_it template inline -arma_hot SpValProxy< SpMat > SpMat::iterator::operator*() { @@ -331,7 +318,6 @@ SpMat::iterator::operator*() template inline -arma_hot typename SpMat::iterator& SpMat::iterator::operator++() { @@ -344,7 +330,6 @@ SpMat::iterator::operator++() template inline -arma_warn_unused typename SpMat::iterator SpMat::iterator::operator++(int) { @@ -359,7 +344,6 @@ SpMat::iterator::operator++(int) template inline -arma_hot typename SpMat::iterator& SpMat::iterator::operator--() { @@ -372,7 +356,6 @@ SpMat::iterator::operator--() template inline -arma_warn_unused typename SpMat::iterator SpMat::iterator::operator--(int) { @@ -573,7 +556,6 @@ SpMat::const_row_iterator::const_row_iterator(const typename SpMat::cons */ template inline -arma_hot typename SpMat::const_row_iterator& SpMat::const_row_iterator::operator++() { @@ -699,7 +681,6 @@ SpMat::const_row_iterator::operator++() */ template inline -arma_warn_unused typename SpMat::const_row_iterator SpMat::const_row_iterator::operator++(int) { @@ -717,7 +698,6 @@ SpMat::const_row_iterator::operator++(int) */ template inline -arma_hot typename SpMat::const_row_iterator& SpMat::const_row_iterator::operator--() { @@ -820,7 +800,6 @@ SpMat::const_row_iterator::operator--() */ template inline -arma_warn_unused typename SpMat::const_row_iterator SpMat::const_row_iterator::operator--(int) { @@ -835,7 +814,6 @@ SpMat::const_row_iterator::operator--(int) template inline -arma_hot bool SpMat::const_row_iterator::operator==(const const_iterator& rhs) const { @@ -846,7 +824,6 @@ SpMat::const_row_iterator::operator==(const const_iterator& rhs) const template inline -arma_hot bool SpMat::const_row_iterator::operator!=(const const_iterator& rhs) const { @@ -857,7 +834,6 @@ SpMat::const_row_iterator::operator!=(const const_iterator& rhs) const template inline -arma_hot bool SpMat::const_row_iterator::operator==(const typename SpSubview::const_iterator& rhs) const { @@ -868,7 +844,6 @@ SpMat::const_row_iterator::operator==(const typename SpSubview::const_it template inline -arma_hot bool SpMat::const_row_iterator::operator!=(const typename SpSubview::const_iterator& rhs) const { @@ -879,7 +854,6 @@ SpMat::const_row_iterator::operator!=(const typename SpSubview::const_it template inline -arma_hot bool SpMat::const_row_iterator::operator==(const const_row_iterator& rhs) const { @@ -890,7 +864,6 @@ SpMat::const_row_iterator::operator==(const const_row_iterator& rhs) const template inline -arma_hot bool SpMat::const_row_iterator::operator!=(const const_row_iterator& rhs) const { @@ -901,7 +874,6 @@ SpMat::const_row_iterator::operator!=(const const_row_iterator& rhs) const template inline -arma_hot bool SpMat::const_row_iterator::operator==(const typename SpSubview::const_row_iterator& rhs) const { @@ -912,7 +884,6 @@ SpMat::const_row_iterator::operator==(const typename SpSubview::const_ro template inline -arma_hot bool SpMat::const_row_iterator::operator!=(const typename SpSubview::const_row_iterator& rhs) const { @@ -927,7 +898,6 @@ SpMat::const_row_iterator::operator!=(const typename SpSubview::const_ro template inline -arma_hot SpValProxy< SpMat > SpMat::row_iterator::operator*() { @@ -942,7 +912,6 @@ SpMat::row_iterator::operator*() template inline -arma_hot typename SpMat::row_iterator& SpMat::row_iterator::operator++() { @@ -955,7 +924,6 @@ SpMat::row_iterator::operator++() template inline -arma_warn_unused typename SpMat::row_iterator SpMat::row_iterator::operator++(int) { @@ -970,7 +938,6 @@ SpMat::row_iterator::operator++(int) template inline -arma_hot typename SpMat::row_iterator& SpMat::row_iterator::operator--() { @@ -983,7 +950,6 @@ SpMat::row_iterator::operator--() template inline -arma_warn_unused typename SpMat::row_iterator SpMat::row_iterator::operator--(int) { diff --git a/include/armadillo_bits/SpMat_meat.hpp b/include/armadillo_bits/SpMat_meat.hpp index c9871cc7..cb816fc8 100644 --- a/include/armadillo_bits/SpMat_meat.hpp +++ b/include/armadillo_bits/SpMat_meat.hpp @@ -3245,7 +3245,6 @@ SpMat::shed_cols(const uword in_col1, const uword in_col2) template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::operator[](const uword i) { @@ -3259,7 +3258,6 @@ SpMat::operator[](const uword i) template arma_inline -arma_warn_unused eT SpMat::operator[](const uword i) const { @@ -3270,7 +3268,6 @@ SpMat::operator[](const uword i) const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::at(const uword i) { @@ -3284,7 +3281,6 @@ SpMat::at(const uword i) template arma_inline -arma_warn_unused eT SpMat::at(const uword i) const { @@ -3295,7 +3291,6 @@ SpMat::at(const uword i) const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::operator()(const uword i) { @@ -3311,7 +3306,6 @@ SpMat::operator()(const uword i) template arma_inline -arma_warn_unused eT SpMat::operator()(const uword i) const { @@ -3331,8 +3325,7 @@ SpMat::operator()(const uword i) const template arma_inline - arma_warn_unused - SpMat_MapMat_val + SpMat_MapMat_val SpMat::operator[] (const uword in_row, const uword in_col) { return SpMat_MapMat_val((*this), cache, in_row, in_col); @@ -3342,8 +3335,7 @@ SpMat::operator()(const uword i) const template arma_inline - arma_warn_unused - eT + eT SpMat::operator[] (const uword in_row, const uword in_col) const { return get_value(in_row, in_col); @@ -3355,7 +3347,6 @@ SpMat::operator()(const uword i) const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::at(const uword in_row, const uword in_col) { @@ -3366,7 +3357,6 @@ SpMat::at(const uword in_row, const uword in_col) template arma_inline -arma_warn_unused eT SpMat::at(const uword in_row, const uword in_col) const { @@ -3377,7 +3367,6 @@ SpMat::at(const uword in_row, const uword in_col) const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::operator()(const uword in_row, const uword in_col) { @@ -3390,7 +3379,6 @@ SpMat::operator()(const uword in_row, const uword in_col) template arma_inline -arma_warn_unused eT SpMat::operator()(const uword in_row, const uword in_col) const { @@ -3406,7 +3394,6 @@ SpMat::operator()(const uword in_row, const uword in_col) const */ template arma_inline -arma_warn_unused bool SpMat::is_empty() const { @@ -3418,7 +3405,6 @@ SpMat::is_empty() const //! returns true if the object can be interpreted as a column or row vector template arma_inline -arma_warn_unused bool SpMat::is_vec() const { @@ -3430,7 +3416,6 @@ SpMat::is_vec() const //! returns true if the object can be interpreted as a row vector template arma_inline -arma_warn_unused bool SpMat::is_rowvec() const { @@ -3442,7 +3427,6 @@ SpMat::is_rowvec() const //! returns true if the object can be interpreted as a column vector template arma_inline -arma_warn_unused bool SpMat::is_colvec() const { @@ -3454,7 +3438,6 @@ SpMat::is_colvec() const //! returns true if the object has the same number of non-zero rows and columnns template arma_inline -arma_warn_unused bool SpMat::is_square() const { @@ -3466,7 +3449,6 @@ SpMat::is_square() const //! returns true if all of the elements are finite template inline -arma_warn_unused bool SpMat::is_finite() const { @@ -3481,7 +3463,6 @@ SpMat::is_finite() const template inline -arma_warn_unused bool SpMat::is_symmetric() const { @@ -3500,7 +3481,6 @@ SpMat::is_symmetric() const template inline -arma_warn_unused bool SpMat::is_symmetric(const typename get_pod_type::result tol) const { @@ -3529,7 +3509,6 @@ SpMat::is_symmetric(const typename get_pod_type::result tol) cons template inline -arma_warn_unused bool SpMat::is_hermitian() const { @@ -3548,7 +3527,6 @@ SpMat::is_hermitian() const template inline -arma_warn_unused bool SpMat::is_hermitian(const typename get_pod_type::result tol) const { @@ -3577,7 +3555,6 @@ SpMat::is_hermitian(const typename get_pod_type::result tol) cons template inline -arma_warn_unused bool SpMat::has_inf() const { @@ -3592,7 +3569,6 @@ SpMat::has_inf() const template inline -arma_warn_unused bool SpMat::has_nan() const { @@ -3607,7 +3583,6 @@ SpMat::has_nan() const template inline -arma_warn_unused bool SpMat::has_nonfinite() const { @@ -3623,7 +3598,6 @@ SpMat::has_nonfinite() const //! returns true if the given index is currently in range template arma_inline -arma_warn_unused bool SpMat::in_range(const uword i) const { @@ -3634,7 +3608,6 @@ SpMat::in_range(const uword i) const //! returns true if the given start and end indices are currently in range template arma_inline -arma_warn_unused bool SpMat::in_range(const span& x) const { @@ -3658,7 +3631,6 @@ SpMat::in_range(const span& x) const //! returns true if the given location is currently in range template arma_inline -arma_warn_unused bool SpMat::in_range(const uword in_row, const uword in_col) const { @@ -3669,7 +3641,6 @@ SpMat::in_range(const uword in_row, const uword in_col) const template arma_inline -arma_warn_unused bool SpMat::in_range(const span& row_span, const uword in_col) const { @@ -3692,7 +3663,6 @@ SpMat::in_range(const span& row_span, const uword in_col) const template arma_inline -arma_warn_unused bool SpMat::in_range(const uword in_row, const span& col_span) const { @@ -3715,7 +3685,6 @@ SpMat::in_range(const uword in_row, const span& col_span) const template arma_inline -arma_warn_unused bool SpMat::in_range(const span& row_span, const span& col_span) const { @@ -3737,7 +3706,6 @@ SpMat::in_range(const span& row_span, const span& col_span) const template arma_inline -arma_warn_unused bool SpMat::in_range(const uword in_row, const uword in_col, const SizeMat& s) const { @@ -4617,7 +4585,6 @@ SpMat::set_imag(const SpBase::pod_type,T1>& X) //! save the matrix to a file template inline -arma_cold bool SpMat::save(const std::string name, const file_type type) const { @@ -4659,7 +4626,6 @@ SpMat::save(const std::string name, const file_type type) const template inline -arma_cold bool SpMat::save(const csv_name& spec, const file_type type) const { @@ -4736,7 +4702,6 @@ SpMat::save(const csv_name& spec, const file_type type) const //! save the matrix to a stream template inline -arma_cold bool SpMat::save(std::ostream& os, const file_type type) const { @@ -4779,7 +4744,6 @@ SpMat::save(std::ostream& os, const file_type type) const //! load a matrix from a file template inline -arma_cold bool SpMat::load(const std::string name, const file_type type) { @@ -4838,7 +4802,6 @@ SpMat::load(const std::string name, const file_type type) template inline -arma_cold bool SpMat::load(const csv_name& spec, const file_type type) { @@ -4929,7 +4892,6 @@ SpMat::load(const csv_name& spec, const file_type type) //! load a matrix from a stream template inline -arma_cold bool SpMat::load(std::istream& is, const file_type type) { @@ -5068,7 +5030,6 @@ SpMat::init(uword in_rows, uword in_cols, const uword new_n_nonzero) template inline void -arma_cold SpMat::init_cold(uword in_rows, uword in_cols, const uword new_n_nonzero) { arma_extra_debug_sigprint(); @@ -6308,7 +6269,6 @@ SpMat::size() const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::front() { @@ -6321,7 +6281,6 @@ SpMat::front() template arma_inline -arma_warn_unused eT SpMat::front() const { @@ -6334,7 +6293,6 @@ SpMat::front() const template arma_inline -arma_warn_unused SpMat_MapMat_val SpMat::back() { @@ -6347,7 +6305,6 @@ SpMat::back() template arma_inline -arma_warn_unused eT SpMat::back() const { @@ -6360,8 +6317,6 @@ SpMat::back() const template inline -arma_hot -arma_warn_unused eT SpMat::get_value(const uword i) const { @@ -6376,8 +6331,6 @@ SpMat::get_value(const uword i) const template inline -arma_hot -arma_warn_unused eT SpMat::get_value(const uword in_row, const uword in_col) const { @@ -6392,8 +6345,6 @@ SpMat::get_value(const uword in_row, const uword in_col) const template inline -arma_hot -arma_warn_unused eT SpMat::get_value_csc(const uword i) const { @@ -6408,8 +6359,6 @@ SpMat::get_value_csc(const uword i) const template inline -arma_hot -arma_warn_unused const eT* SpMat::find_value_csc(const uword in_row, const uword in_col) const { @@ -6436,8 +6385,6 @@ SpMat::find_value_csc(const uword in_row, const uword in_col) const template inline -arma_hot -arma_warn_unused eT SpMat::get_value_csc(const uword in_row, const uword in_col) const { @@ -6450,8 +6397,6 @@ SpMat::get_value_csc(const uword in_row, const uword in_col) const template inline -arma_hot -arma_warn_unused bool SpMat::try_set_value_csc(const uword in_row, const uword in_col, const eT in_val) { @@ -6474,8 +6419,6 @@ SpMat::try_set_value_csc(const uword in_row, const uword in_col, const eT in template inline -arma_hot -arma_warn_unused bool SpMat::try_add_value_csc(const uword in_row, const uword in_col, const eT in_val) { @@ -6500,8 +6443,6 @@ SpMat::try_add_value_csc(const uword in_row, const uword in_col, const eT in template inline -arma_hot -arma_warn_unused bool SpMat::try_sub_value_csc(const uword in_row, const uword in_col, const eT in_val) { @@ -6526,8 +6467,6 @@ SpMat::try_sub_value_csc(const uword in_row, const uword in_col, const eT in template inline -arma_hot -arma_warn_unused bool SpMat::try_mul_value_csc(const uword in_row, const uword in_col, const eT in_val) { @@ -6552,8 +6491,6 @@ SpMat::try_mul_value_csc(const uword in_row, const uword in_col, const eT in template inline -arma_hot -arma_warn_unused bool SpMat::try_div_value_csc(const uword in_row, const uword in_col, const eT in_val) { @@ -6583,7 +6520,6 @@ SpMat::try_div_value_csc(const uword in_row, const uword in_col, const eT in */ template inline -arma_warn_unused eT& SpMat::insert_element(const uword in_row, const uword in_col, const eT val) { diff --git a/include/armadillo_bits/SpRow_bones.hpp b/include/armadillo_bits/SpRow_bones.hpp index 9b46a9f2..c13de1b4 100644 --- a/include/armadillo_bits/SpRow_bones.hpp +++ b/include/armadillo_bits/SpRow_bones.hpp @@ -56,9 +56,9 @@ class SpRow : public SpMat template inline explicit SpRow(const SpBase& A, const SpBase& B); - inline arma_warn_unused const SpOp,spop_htrans> t() const; - inline arma_warn_unused const SpOp,spop_htrans> ht() const; - inline arma_warn_unused const SpOp,spop_strans> st() const; + arma_warn_unused inline const SpOp,spop_htrans> t() const; + arma_warn_unused inline const SpOp,spop_htrans> ht() const; + arma_warn_unused inline const SpOp,spop_strans> st() const; inline void shed_col (const uword col_num); inline void shed_cols(const uword in_col1, const uword in_col2); diff --git a/include/armadillo_bits/SpRow_meat.hpp b/include/armadillo_bits/SpRow_meat.hpp index f419514f..10f052f7 100644 --- a/include/armadillo_bits/SpRow_meat.hpp +++ b/include/armadillo_bits/SpRow_meat.hpp @@ -204,7 +204,6 @@ SpRow::SpRow template inline -arma_warn_unused const SpOp,spop_htrans> SpRow::t() const { @@ -215,7 +214,6 @@ SpRow::t() const template inline -arma_warn_unused const SpOp,spop_htrans> SpRow::ht() const { @@ -226,7 +224,6 @@ SpRow::ht() const template inline -arma_warn_unused const SpOp,spop_strans> SpRow::st() const { diff --git a/include/armadillo_bits/SpSubview_bones.hpp b/include/armadillo_bits/SpSubview_bones.hpp index da60d972..ed702994 100644 --- a/include/armadillo_bits/SpSubview_bones.hpp +++ b/include/armadillo_bits/SpSubview_bones.hpp @@ -197,23 +197,23 @@ class SpSubview : public SpBase< eT, SpSubview > // Don't hold location internally; call "dummy" methods to get that information. arma_inline uword row() const { return iterator_base::M->m.row_indices[iterator_base::internal_pos + skip_pos] - iterator_base::M->aux_row1; } - inline arma_hot const_iterator& operator++(); - inline arma_warn_unused const_iterator operator++(int); + arma_hot inline const_iterator& operator++(); + arma_warn_unused inline const_iterator operator++(int); - inline arma_hot const_iterator& operator--(); - inline arma_warn_unused const_iterator operator--(int); + arma_hot inline const_iterator& operator--(); + arma_warn_unused inline const_iterator operator--(int); - inline arma_hot bool operator!=(const const_iterator& rhs) const; - inline arma_hot bool operator==(const const_iterator& rhs) const; + arma_hot inline bool operator!=(const const_iterator& rhs) const; + arma_hot inline bool operator==(const const_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpMat::const_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpMat::const_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpMat::const_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpMat::const_iterator& rhs) const; - inline arma_hot bool operator!=(const const_row_iterator& rhs) const; - inline arma_hot bool operator==(const const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const const_row_iterator& rhs) const; + arma_hot inline bool operator==(const const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpMat::const_row_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpMat::const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpMat::const_row_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpMat::const_row_iterator& rhs) const; arma_aligned uword skip_pos; // not used in row_iterator or const_row_iterator }; @@ -227,14 +227,14 @@ class SpSubview : public SpBase< eT, SpSubview > inline iterator(SpSubview& in_M, const uword in_row, const uword in_col, const uword in_pos, const uword in_skip_pos) : const_iterator(in_M, in_row, in_col, in_pos, in_skip_pos) { } inline iterator(const iterator& other) : const_iterator(other) { } - inline arma_hot SpValProxy< SpSubview > operator*(); + arma_hot inline SpValProxy< SpSubview > operator*(); // overloads needed for return type correctness - inline arma_hot iterator& operator++(); - inline arma_warn_unused iterator operator++(int); + arma_hot inline iterator& operator++(); + arma_warn_unused inline iterator operator++(int); - inline arma_hot iterator& operator--(); - inline arma_warn_unused iterator operator--(int); + arma_hot inline iterator& operator--(); + arma_warn_unused inline iterator operator--(int); // This has a different value_type than iterator_base. typedef SpValProxy< SpSubview > value_type; @@ -251,11 +251,11 @@ class SpSubview : public SpBase< eT, SpSubview > inline const_row_iterator(const SpSubview& in_M, uword in_row, uword in_col); inline const_row_iterator(const const_row_iterator& other); - inline arma_hot const_row_iterator& operator++(); - inline arma_warn_unused const_row_iterator operator++(int); + arma_hot inline const_row_iterator& operator++(); + arma_warn_unused inline const_row_iterator operator++(int); - inline arma_hot const_row_iterator& operator--(); - inline arma_warn_unused const_row_iterator operator--(int); + arma_hot inline const_row_iterator& operator--(); + arma_warn_unused inline const_row_iterator operator--(int); uword internal_row; // Hold row internally because we use internal_pos differently. uword actual_pos; // Actual position in subview's parent matrix. @@ -264,17 +264,17 @@ class SpSubview : public SpBase< eT, SpSubview > arma_inline uword row() const { return internal_row; } - inline arma_hot bool operator!=(const const_iterator& rhs) const; - inline arma_hot bool operator==(const const_iterator& rhs) const; + arma_hot inline bool operator!=(const const_iterator& rhs) const; + arma_hot inline bool operator==(const const_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpMat::const_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpMat::const_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpMat::const_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpMat::const_iterator& rhs) const; - inline arma_hot bool operator!=(const const_row_iterator& rhs) const; - inline arma_hot bool operator==(const const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const const_row_iterator& rhs) const; + arma_hot inline bool operator==(const const_row_iterator& rhs) const; - inline arma_hot bool operator!=(const typename SpMat::const_row_iterator& rhs) const; - inline arma_hot bool operator==(const typename SpMat::const_row_iterator& rhs) const; + arma_hot inline bool operator!=(const typename SpMat::const_row_iterator& rhs) const; + arma_hot inline bool operator==(const typename SpMat::const_row_iterator& rhs) const; }; class row_iterator : public const_row_iterator @@ -285,14 +285,14 @@ class SpSubview : public SpBase< eT, SpSubview > inline row_iterator(SpSubview& in_M, uword in_row, uword in_col) : const_row_iterator(in_M, in_row, in_col) { } inline row_iterator(const row_iterator& other) : const_row_iterator(other) { } - inline arma_hot SpValProxy< SpSubview > operator*(); + arma_hot inline SpValProxy< SpSubview > operator*(); // overloads needed for return type correctness - inline arma_hot row_iterator& operator++(); - inline arma_warn_unused row_iterator operator++(int); + arma_hot inline row_iterator& operator++(); + arma_warn_unused inline row_iterator operator++(int); - inline arma_hot row_iterator& operator--(); - inline arma_warn_unused row_iterator operator--(int); + arma_hot inline row_iterator& operator--(); + arma_warn_unused inline row_iterator operator--(int); // This has a different value_type than iterator_base. typedef SpValProxy< SpSubview > value_type; @@ -331,8 +331,8 @@ class SpSubview : public SpBase< eT, SpSubview > friend class SpSubview_row; friend class SpValProxy< SpSubview >; // allow SpValProxy to call insert_element() and delete_element() - inline arma_warn_unused eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0)); - inline void delete_element(const uword in_row, const uword in_col); + arma_warn_unused inline eT& insert_element(const uword in_row, const uword in_col, const eT in_val = eT(0)); + inline void delete_element(const uword in_row, const uword in_col); inline void invalidate_cache() const; }; @@ -357,9 +357,9 @@ class SpSubview_col : public SpSubview template inline void operator= (const SpBase& x); template inline void operator= (const Base& x); - inline arma_warn_unused const SpOp,spop_htrans> t() const; - inline arma_warn_unused const SpOp,spop_htrans> ht() const; - inline arma_warn_unused const SpOp,spop_strans> st() const; + arma_warn_unused inline const SpOp,spop_htrans> t() const; + arma_warn_unused inline const SpOp,spop_htrans> ht() const; + arma_warn_unused inline const SpOp,spop_strans> st() const; protected: @@ -395,9 +395,9 @@ class SpSubview_row : public SpSubview template inline void operator= (const SpBase& x); template inline void operator= (const Base& x); - inline arma_warn_unused const SpOp,spop_htrans> t() const; - inline arma_warn_unused const SpOp,spop_htrans> ht() const; - inline arma_warn_unused const SpOp,spop_strans> st() const; + arma_warn_unused inline const SpOp,spop_htrans> t() const; + arma_warn_unused inline const SpOp,spop_htrans> ht() const; + arma_warn_unused inline const SpOp,spop_strans> st() const; protected: diff --git a/include/armadillo_bits/SpSubview_iterators_meat.hpp b/include/armadillo_bits/SpSubview_iterators_meat.hpp index 7bc4b999..d97d7c63 100644 --- a/include/armadillo_bits/SpSubview_iterators_meat.hpp +++ b/include/armadillo_bits/SpSubview_iterators_meat.hpp @@ -280,7 +280,6 @@ SpSubview::const_iterator::operator*() const template inline -arma_hot typename SpSubview::const_iterator& SpSubview::const_iterator::operator++() { @@ -339,7 +338,6 @@ SpSubview::const_iterator::operator++() template inline -arma_warn_unused typename SpSubview::const_iterator SpSubview::const_iterator::operator++(int) { @@ -354,7 +352,6 @@ SpSubview::const_iterator::operator++(int) template inline -arma_hot typename SpSubview::const_iterator& SpSubview::const_iterator::operator--() { @@ -410,7 +407,6 @@ SpSubview::const_iterator::operator--() template inline -arma_warn_unused typename SpSubview::const_iterator SpSubview::const_iterator::operator--(int) { @@ -425,7 +421,6 @@ SpSubview::const_iterator::operator--(int) template inline -arma_hot bool SpSubview::const_iterator::operator==(const const_iterator& rhs) const { @@ -436,7 +431,6 @@ SpSubview::const_iterator::operator==(const const_iterator& rhs) const template inline -arma_hot bool SpSubview::const_iterator::operator!=(const const_iterator& rhs) const { @@ -447,7 +441,6 @@ SpSubview::const_iterator::operator!=(const const_iterator& rhs) const template inline -arma_hot bool SpSubview::const_iterator::operator==(const typename SpMat::const_iterator& rhs) const { @@ -458,7 +451,6 @@ SpSubview::const_iterator::operator==(const typename SpMat::const_iterat template inline -arma_hot bool SpSubview::const_iterator::operator!=(const typename SpMat::const_iterator& rhs) const { @@ -469,7 +461,6 @@ SpSubview::const_iterator::operator!=(const typename SpMat::const_iterat template inline -arma_hot bool SpSubview::const_iterator::operator==(const const_row_iterator& rhs) const { @@ -480,7 +471,6 @@ SpSubview::const_iterator::operator==(const const_row_iterator& rhs) const template inline -arma_hot bool SpSubview::const_iterator::operator!=(const const_row_iterator& rhs) const { @@ -491,7 +481,6 @@ SpSubview::const_iterator::operator!=(const const_row_iterator& rhs) const template inline -arma_hot bool SpSubview::const_iterator::operator==(const typename SpMat::const_row_iterator& rhs) const { @@ -502,7 +491,6 @@ SpSubview::const_iterator::operator==(const typename SpMat::const_row_it template inline -arma_hot bool SpSubview::const_iterator::operator!=(const typename SpMat::const_row_iterator& rhs) const { @@ -517,7 +505,6 @@ SpSubview::const_iterator::operator!=(const typename SpMat::const_row_it template inline -arma_hot SpValProxy< SpSubview > SpSubview::iterator::operator*() { @@ -532,7 +519,6 @@ SpSubview::iterator::operator*() template inline -arma_hot typename SpSubview::iterator& SpSubview::iterator::operator++() { @@ -544,7 +530,6 @@ SpSubview::iterator::operator++() template inline -arma_warn_unused typename SpSubview::iterator SpSubview::iterator::operator++(int) { @@ -559,7 +544,6 @@ SpSubview::iterator::operator++(int) template inline -arma_hot typename SpSubview::iterator& SpSubview::iterator::operator--() { @@ -571,7 +555,6 @@ SpSubview::iterator::operator--() template inline -arma_warn_unused typename SpSubview::iterator SpSubview::iterator::operator--(int) { @@ -770,7 +753,6 @@ SpSubview::const_row_iterator::const_row_iterator(const const_row_iterator& template inline -arma_hot typename SpSubview::const_row_iterator& SpSubview::const_row_iterator::operator++() { @@ -897,7 +879,6 @@ SpSubview::const_row_iterator::operator++() template inline -arma_warn_unused typename SpSubview::const_row_iterator SpSubview::const_row_iterator::operator++(int) { @@ -912,7 +893,6 @@ SpSubview::const_row_iterator::operator++(int) template inline -arma_hot typename SpSubview::const_row_iterator& SpSubview::const_row_iterator::operator--() { @@ -1012,7 +992,6 @@ SpSubview::const_row_iterator::operator--() template inline -arma_warn_unused typename SpSubview::const_row_iterator SpSubview::const_row_iterator::operator--(int) { @@ -1027,7 +1006,6 @@ SpSubview::const_row_iterator::operator--(int) template inline -arma_hot bool SpSubview::const_row_iterator::operator==(const const_iterator& rhs) const { @@ -1038,7 +1016,6 @@ SpSubview::const_row_iterator::operator==(const const_iterator& rhs) const template inline -arma_hot bool SpSubview::const_row_iterator::operator!=(const const_iterator& rhs) const { @@ -1049,7 +1026,6 @@ SpSubview::const_row_iterator::operator!=(const const_iterator& rhs) const template inline -arma_hot bool SpSubview::const_row_iterator::operator==(const typename SpMat::const_iterator& rhs) const { @@ -1060,7 +1036,6 @@ SpSubview::const_row_iterator::operator==(const typename SpMat::const_it template inline -arma_hot bool SpSubview::const_row_iterator::operator!=(const typename SpMat::const_iterator& rhs) const { @@ -1071,7 +1046,6 @@ SpSubview::const_row_iterator::operator!=(const typename SpMat::const_it template inline -arma_hot bool SpSubview::const_row_iterator::operator==(const const_row_iterator& rhs) const { @@ -1082,7 +1056,6 @@ SpSubview::const_row_iterator::operator==(const const_row_iterator& rhs) con template inline -arma_hot bool SpSubview::const_row_iterator::operator!=(const const_row_iterator& rhs) const { @@ -1093,7 +1066,6 @@ SpSubview::const_row_iterator::operator!=(const const_row_iterator& rhs) con template inline -arma_hot bool SpSubview::const_row_iterator::operator==(const typename SpMat::const_row_iterator& rhs) const { @@ -1104,7 +1076,6 @@ SpSubview::const_row_iterator::operator==(const typename SpMat::const_ro template inline -arma_hot bool SpSubview::const_row_iterator::operator!=(const typename SpMat::const_row_iterator& rhs) const { @@ -1119,7 +1090,6 @@ SpSubview::const_row_iterator::operator!=(const typename SpMat::const_ro template inline -arma_hot SpValProxy< SpSubview > SpSubview::row_iterator::operator*() { @@ -1134,7 +1104,6 @@ SpSubview::row_iterator::operator*() template inline -arma_hot typename SpSubview::row_iterator& SpSubview::row_iterator::operator++() { @@ -1146,7 +1115,6 @@ SpSubview::row_iterator::operator++() template inline -arma_warn_unused typename SpSubview::row_iterator SpSubview::row_iterator::operator++(int) { @@ -1161,7 +1129,6 @@ SpSubview::row_iterator::operator++(int) template inline -arma_hot typename SpSubview::row_iterator& SpSubview::row_iterator::operator--() { @@ -1173,7 +1140,6 @@ SpSubview::row_iterator::operator--() template inline -arma_warn_unused typename SpSubview::row_iterator SpSubview::row_iterator::operator--(int) { diff --git a/include/armadillo_bits/SpSubview_meat.hpp b/include/armadillo_bits/SpSubview_meat.hpp index 86dae087..0c3f7d97 100644 --- a/include/armadillo_bits/SpSubview_meat.hpp +++ b/include/armadillo_bits/SpSubview_meat.hpp @@ -941,7 +941,6 @@ SpSubview::randn() template -arma_hot inline SpSubview_MapMat_val SpSubview::operator[](const uword i) @@ -955,7 +954,6 @@ SpSubview::operator[](const uword i) template -arma_hot inline eT SpSubview::operator[](const uword i) const @@ -969,7 +967,6 @@ SpSubview::operator[](const uword i) const template -arma_hot inline SpSubview_MapMat_val SpSubview::operator()(const uword i) @@ -985,7 +982,6 @@ SpSubview::operator()(const uword i) template -arma_hot inline eT SpSubview::operator()(const uword i) const @@ -1001,7 +997,6 @@ SpSubview::operator()(const uword i) const template -arma_hot inline SpSubview_MapMat_val SpSubview::operator()(const uword in_row, const uword in_col) @@ -1014,7 +1009,6 @@ SpSubview::operator()(const uword in_row, const uword in_col) template -arma_hot inline eT SpSubview::operator()(const uword in_row, const uword in_col) const @@ -1027,7 +1021,6 @@ SpSubview::operator()(const uword in_row, const uword in_col) const template -arma_hot inline SpSubview_MapMat_val SpSubview::at(const uword i) @@ -1041,7 +1034,6 @@ SpSubview::at(const uword i) template -arma_hot inline eT SpSubview::at(const uword i) const @@ -1055,7 +1047,6 @@ SpSubview::at(const uword i) const template -arma_hot inline SpSubview_MapMat_val SpSubview::at(const uword in_row, const uword in_col) @@ -1066,7 +1057,6 @@ SpSubview::at(const uword in_row, const uword in_col) template -arma_hot inline eT SpSubview::at(const uword in_row, const uword in_col) const @@ -1642,7 +1632,6 @@ SpSubview::is_alias(const SpMat& X) const template inline -arma_warn_unused eT& SpSubview::insert_element(const uword in_row, const uword in_col, const eT in_val) { @@ -1764,7 +1753,6 @@ SpSubview_col::operator=(const Base& x) template inline -arma_warn_unused const SpOp,spop_htrans> SpSubview_col::t() const { @@ -1775,7 +1763,6 @@ SpSubview_col::t() const template inline -arma_warn_unused const SpOp,spop_htrans> SpSubview_col::ht() const { @@ -1786,7 +1773,6 @@ SpSubview_col::ht() const template inline -arma_warn_unused const SpOp,spop_strans> SpSubview_col::st() const { @@ -1873,7 +1859,6 @@ SpSubview_row::operator=(const Base& x) template inline -arma_warn_unused const SpOp,spop_htrans> SpSubview_row::t() const { @@ -1884,7 +1869,6 @@ SpSubview_row::t() const template inline -arma_warn_unused const SpOp,spop_htrans> SpSubview_row::ht() const { @@ -1895,7 +1879,6 @@ SpSubview_row::ht() const template inline -arma_warn_unused const SpOp,spop_strans> SpSubview_row::st() const { diff --git a/include/armadillo_bits/arma_ostream_meat.hpp b/include/armadillo_bits/arma_ostream_meat.hpp index 34cc9187..dbd4b6ca 100644 --- a/include/armadillo_bits/arma_ostream_meat.hpp +++ b/include/armadillo_bits/arma_ostream_meat.hpp @@ -425,7 +425,6 @@ arma_ostream::raw_print_elem(std::ostream& o, const std::complex& x) //! Print a matrix to the specified stream template -arma_cold inline void arma_ostream::print(std::ostream& o, const Mat& m, const bool modify) @@ -495,7 +494,6 @@ arma_ostream::print(std::ostream& o, const Mat& m, const bool modify) //! Print a cube to the specified stream template -arma_cold inline void arma_ostream::print(std::ostream& o, const Cube& x, const bool modify) @@ -538,7 +536,6 @@ arma_ostream::print(std::ostream& o, const Cube& x, const bool modify) //! Print a field to the specified stream //! Assumes type oT can be printed, ie. oT has std::ostream& operator<< (std::ostream&, const oT&) template -arma_cold inline void arma_ostream::print(std::ostream& o, const field& x) @@ -612,7 +609,6 @@ arma_ostream::print(std::ostream& o, const field& x) //! Print a subfield to the specified stream //! Assumes type oT can be printed, ie. oT has std::ostream& operator<< (std::ostream&, const oT&) template -arma_cold inline void arma_ostream::print(std::ostream& o, const subview_field& x) @@ -683,7 +679,6 @@ arma_ostream::print(std::ostream& o, const subview_field& x) template -arma_cold inline void arma_ostream::print_dense(std::ostream& o, const SpMat& m, const bool modify) @@ -766,7 +761,6 @@ arma_ostream::print_dense(std::ostream& o, const SpMat& m, const bool modify template -arma_cold inline void arma_ostream::print(std::ostream& o, const SpMat& m, const bool modify) @@ -869,7 +863,6 @@ arma_ostream::print(std::ostream& o, const SpMat& m, const bool modify) -arma_cold inline void arma_ostream::print(std::ostream& o, const SizeMat& S) @@ -891,7 +884,6 @@ arma_ostream::print(std::ostream& o, const SizeMat& S) -arma_cold inline void arma_ostream::print(std::ostream& o, const SizeCube& S) @@ -914,7 +906,6 @@ arma_ostream::print(std::ostream& o, const SizeCube& S) template -arma_cold inline void arma_ostream::brief_print(std::ostream& o, const Mat& m, const bool print_size) @@ -1073,7 +1064,6 @@ arma_ostream::brief_print(std::ostream& o, const Mat& m, const bool print_si template -arma_cold inline void arma_ostream::brief_print(std::ostream& o, const Cube& x) @@ -1131,7 +1121,6 @@ arma_ostream::brief_print(std::ostream& o, const Cube& x) template -arma_cold inline void arma_ostream::brief_print(std::ostream& o, const SpMat& m) diff --git a/include/armadillo_bits/arrayops_meat.hpp b/include/armadillo_bits/arrayops_meat.hpp index b0cdc57a..e5d7beda 100644 --- a/include/armadillo_bits/arrayops_meat.hpp +++ b/include/armadillo_bits/arrayops_meat.hpp @@ -55,7 +55,6 @@ arrayops::fill_zeros(eT* dest, const uword n_elem) template -arma_hot inline void arrayops::replace(eT* mem, const uword n_elem, const eT old_val, const eT new_val) @@ -83,7 +82,6 @@ arrayops::replace(eT* mem, const uword n_elem, const eT old_val, const eT new_va template -arma_hot inline void arrayops::clean(eT* mem, const uword n_elem, const eT abs_limit, const typename arma_not_cx::result* junk) @@ -101,7 +99,6 @@ arrayops::clean(eT* mem, const uword n_elem, const eT abs_limit, const typename template -arma_hot inline void arrayops::clean(std::complex* mem, const uword n_elem, const T abs_limit) @@ -234,7 +231,6 @@ arrayops::convert_cx_scalar template -arma_hot inline void arrayops::convert(out_eT* dest, const in_eT* src, const uword n_elem) @@ -304,7 +300,6 @@ arrayops::convert(out_eT* dest, const in_eT* src, const uword n_elem) template -arma_hot inline void arrayops::convert_cx(out_eT* dest, const in_eT* src, const uword n_elem) @@ -326,7 +321,6 @@ arrayops::convert_cx(out_eT* dest, const in_eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_plus(eT* dest, const eT* src, const uword n_elem) @@ -364,7 +358,6 @@ arrayops::inplace_plus(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_minus(eT* dest, const eT* src, const uword n_elem) @@ -402,7 +395,6 @@ arrayops::inplace_minus(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_mul(eT* dest, const eT* src, const uword n_elem) @@ -440,7 +432,6 @@ arrayops::inplace_mul(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_div(eT* dest, const eT* src, const uword n_elem) @@ -478,7 +469,6 @@ arrayops::inplace_div(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_plus_base(eT* dest, const eT* src, const uword n_elem) @@ -514,7 +504,6 @@ arrayops::inplace_plus_base(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_minus_base(eT* dest, const eT* src, const uword n_elem) @@ -550,7 +539,6 @@ arrayops::inplace_minus_base(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_mul_base(eT* dest, const eT* src, const uword n_elem) @@ -586,7 +574,6 @@ arrayops::inplace_mul_base(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_div_base(eT* dest, const eT* src, const uword n_elem) @@ -622,7 +609,6 @@ arrayops::inplace_div_base(eT* dest, const eT* src, const uword n_elem) template -arma_hot inline void arrayops::inplace_set(eT* dest, const eT val, const uword n_elem) @@ -640,7 +626,6 @@ arrayops::inplace_set(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_set_simple(eT* dest, const eT val, const uword n_elem) @@ -660,7 +645,6 @@ arrayops::inplace_set_simple(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_set_base(eT* dest, const eT val, const uword n_elem) @@ -693,7 +677,6 @@ arrayops::inplace_set_base(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_set_fixed(eT* dest, const eT val) @@ -707,7 +690,6 @@ arrayops::inplace_set_fixed(eT* dest, const eT val) template -arma_hot inline void arrayops::inplace_plus(eT* dest, const eT val, const uword n_elem) @@ -727,7 +709,6 @@ arrayops::inplace_plus(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_minus(eT* dest, const eT val, const uword n_elem) @@ -747,7 +728,6 @@ arrayops::inplace_minus(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_mul(eT* dest, const eT val, const uword n_elem) @@ -767,7 +747,6 @@ arrayops::inplace_mul(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_div(eT* dest, const eT val, const uword n_elem) @@ -787,7 +766,6 @@ arrayops::inplace_div(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_plus_base(eT* dest, const eT val, const uword n_elem) @@ -820,7 +798,6 @@ arrayops::inplace_plus_base(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_minus_base(eT* dest, const eT val, const uword n_elem) @@ -853,7 +830,6 @@ arrayops::inplace_minus_base(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_mul_base(eT* dest, const eT val, const uword n_elem) @@ -886,7 +862,6 @@ arrayops::inplace_mul_base(eT* dest, const eT val, const uword n_elem) template -arma_hot inline void arrayops::inplace_div_base(eT* dest, const eT val, const uword n_elem) @@ -919,7 +894,6 @@ arrayops::inplace_div_base(eT* dest, const eT val, const uword n_elem) template -arma_hot inline eT arrayops::accumulate(const eT* src, const uword n_elem) @@ -966,7 +940,6 @@ arrayops::accumulate(const eT* src, const uword n_elem) template -arma_hot inline eT arrayops::product(const eT* src, const uword n_elem) @@ -993,7 +966,6 @@ arrayops::product(const eT* src, const uword n_elem) template -arma_hot inline bool arrayops::is_zero(const eT* mem, const uword n_elem, const eT abs_limit, const typename arma_not_cx::result* junk) @@ -1023,7 +995,6 @@ arrayops::is_zero(const eT* mem, const uword n_elem, const eT abs_limit, const t template -arma_hot inline bool arrayops::is_zero(const std::complex* mem, const uword n_elem, const T abs_limit) @@ -1059,7 +1030,6 @@ arrayops::is_zero(const std::complex* mem, const uword n_elem, const T abs_li template -arma_hot inline bool arrayops::is_finite(const eT* src, const uword n_elem) @@ -1086,7 +1056,6 @@ arrayops::is_finite(const eT* src, const uword n_elem) template -arma_hot inline bool arrayops::has_inf(const eT* src, const uword n_elem) @@ -1112,7 +1081,6 @@ arrayops::has_inf(const eT* src, const uword n_elem) template -arma_hot inline bool arrayops::has_nan(const eT* src, const uword n_elem) diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index 432ca927..4ff55946 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -394,9 +394,10 @@ #endif -// #if defined(ARMA_HAVE_CXX17) -// #define arma_warn_unused [[nodiscard]] -// #endif +#if defined(ARMA_HAVE_CXX17) + #undef arma_warn_unused + #define arma_warn_unused [[nodiscard]] +#endif #if !defined(ARMA_DONT_USE_OPENMP) diff --git a/include/armadillo_bits/diskio_bones.hpp b/include/armadillo_bits/diskio_bones.hpp index 176068b5..6d913497 100644 --- a/include/armadillo_bits/diskio_bones.hpp +++ b/include/armadillo_bits/diskio_bones.hpp @@ -40,21 +40,21 @@ class diskio friend class SpMat_aux; friend class field_aux; - template inline arma_cold static std::string gen_txt_header(const Mat&); - template inline arma_cold static std::string gen_bin_header(const Mat&); + template arma_cold inline static std::string gen_txt_header(const Mat&); + template arma_cold inline static std::string gen_bin_header(const Mat&); - template inline arma_cold static std::string gen_bin_header(const SpMat&); + template arma_cold inline static std::string gen_bin_header(const SpMat&); - template inline arma_cold static std::string gen_txt_header(const Cube&); - template inline arma_cold static std::string gen_bin_header(const Cube&); + template arma_cold inline static std::string gen_txt_header(const Cube&); + template arma_cold inline static std::string gen_bin_header(const Cube&); - inline arma_cold static file_type guess_file_type_internal(std::istream& f); + arma_cold inline static file_type guess_file_type_internal(std::istream& f); - inline arma_cold static std::string gen_tmp_name(const std::string& x); + arma_cold inline static std::string gen_tmp_name(const std::string& x); - inline arma_cold static bool safe_rename(const std::string& old_name, const std::string& new_name); + arma_cold inline static bool safe_rename(const std::string& old_name, const std::string& new_name); - inline arma_cold static bool is_readable(const std::string& name); + arma_cold inline static bool is_readable(const std::string& name); template inline static bool convert_token(eT& val, const std::string& token); template inline static bool convert_token(std::complex& val, const std::string& token); diff --git a/include/armadillo_bits/diskio_meat.hpp b/include/armadillo_bits/diskio_meat.hpp index 79134025..23630269 100644 --- a/include/armadillo_bits/diskio_meat.hpp +++ b/include/armadillo_bits/diskio_meat.hpp @@ -27,7 +27,6 @@ //! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes. template inline -arma_cold std::string diskio::gen_txt_header(const Mat&) { @@ -77,7 +76,6 @@ diskio::gen_txt_header(const Mat&) //! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes. template inline -arma_cold std::string diskio::gen_bin_header(const Mat&) { @@ -127,7 +125,6 @@ diskio::gen_bin_header(const Mat&) //! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes. template inline -arma_cold std::string diskio::gen_bin_header(const SpMat&) { @@ -176,7 +173,6 @@ diskio::gen_bin_header(const SpMat&) //! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes. template inline -arma_cold std::string diskio::gen_txt_header(const Cube&) { @@ -226,7 +222,6 @@ diskio::gen_txt_header(const Cube&) //! XYZ specifies the width of each element in terms of bytes, eg. "008" indicates eight bytes. template inline -arma_cold std::string diskio::gen_bin_header(const Cube&) { @@ -281,7 +276,6 @@ diskio::guess_file_type(std::istream& f) inline -arma_cold file_type diskio::guess_file_type_internal(std::istream& f) { @@ -356,7 +350,6 @@ diskio::guess_file_type_internal(std::istream& f) //! Append a quasi-random string to the given filename. //! Avoiding use of rand() to preserve its state. inline -arma_cold std::string diskio::gen_tmp_name(const std::string& x) { @@ -393,7 +386,6 @@ diskio::gen_tmp_name(const std::string& x) //! (i) overwriting files that are write protected, //! (ii) overwriting directories. inline -arma_cold bool diskio::safe_rename(const std::string& old_name, const std::string& new_name) { @@ -413,7 +405,6 @@ diskio::safe_rename(const std::string& old_name, const std::string& new_name) inline -arma_cold bool diskio::is_readable(const std::string& name) { diff --git a/include/armadillo_bits/eglue_core_meat.hpp b/include/armadillo_bits/eglue_core_meat.hpp index 1978ecba..a36f3895 100644 --- a/include/armadillo_bits/eglue_core_meat.hpp +++ b/include/armadillo_bits/eglue_core_meat.hpp @@ -255,7 +255,6 @@ template template -arma_hot inline void eglue_core::apply(outT& out, const eGlue& x) @@ -355,7 +354,6 @@ eglue_core::apply(outT& out, const eGlue& x) template template -arma_hot inline void eglue_core::apply_inplace_plus(Mat& out, const eGlue& x) @@ -453,7 +451,6 @@ eglue_core::apply_inplace_plus(Mat& out, con template template -arma_hot inline void eglue_core::apply_inplace_minus(Mat& out, const eGlue& x) @@ -551,7 +548,6 @@ eglue_core::apply_inplace_minus(Mat& out, co template template -arma_hot inline void eglue_core::apply_inplace_schur(Mat& out, const eGlue& x) @@ -649,7 +645,6 @@ eglue_core::apply_inplace_schur(Mat& out, co template template -arma_hot inline void eglue_core::apply_inplace_div(Mat& out, const eGlue& x) @@ -752,7 +747,6 @@ eglue_core::apply_inplace_div(Mat& out, cons template template -arma_hot inline void eglue_core::apply(Cube& out, const eGlueCube& x) @@ -853,7 +847,6 @@ eglue_core::apply(Cube& out, const eGlueCube template template -arma_hot inline void eglue_core::apply_inplace_plus(Cube& out, const eGlueCube& x) @@ -952,7 +945,6 @@ eglue_core::apply_inplace_plus(Cube& out, co template template -arma_hot inline void eglue_core::apply_inplace_minus(Cube& out, const eGlueCube& x) @@ -1051,7 +1043,6 @@ eglue_core::apply_inplace_minus(Cube& out, c template template -arma_hot inline void eglue_core::apply_inplace_schur(Cube& out, const eGlueCube& x) @@ -1150,7 +1141,6 @@ eglue_core::apply_inplace_schur(Cube& out, c template template -arma_hot inline void eglue_core::apply_inplace_div(Cube& out, const eGlueCube& x) diff --git a/include/armadillo_bits/eop_core_meat.hpp b/include/armadillo_bits/eop_core_meat.hpp index 7545ad1c..4bc0c7fe 100644 --- a/include/armadillo_bits/eop_core_meat.hpp +++ b/include/armadillo_bits/eop_core_meat.hpp @@ -241,7 +241,6 @@ template template -arma_hot inline void eop_core::apply(outT& out, const eOp& x) @@ -317,7 +316,6 @@ eop_core::apply(outT& out, const eOp& x) template template -arma_hot inline void eop_core::apply_inplace_plus(Mat& out, const eOp& x) @@ -392,7 +390,7 @@ eop_core::apply_inplace_plus(Mat& out, const e template template -arma_hot + inline void eop_core::apply_inplace_minus(Mat& out, const eOp& x) @@ -467,7 +465,7 @@ eop_core::apply_inplace_minus(Mat& out, const template template -arma_hot + inline void eop_core::apply_inplace_schur(Mat& out, const eOp& x) @@ -542,7 +540,7 @@ eop_core::apply_inplace_schur(Mat& out, const template template -arma_hot + inline void eop_core::apply_inplace_div(Mat& out, const eOp& x) @@ -622,7 +620,7 @@ eop_core::apply_inplace_div(Mat& out, const eO template template -arma_hot + inline void eop_core::apply(Cube& out, const eOpCube& x) @@ -699,7 +697,7 @@ eop_core::apply(Cube& out, const eOpCube template -arma_hot + inline void eop_core::apply_inplace_plus(Cube& out, const eOpCube& x) @@ -775,7 +773,7 @@ eop_core::apply_inplace_plus(Cube& out, const template template -arma_hot + inline void eop_core::apply_inplace_minus(Cube& out, const eOpCube& x) @@ -851,7 +849,7 @@ eop_core::apply_inplace_minus(Cube& out, const template template -arma_hot + inline void eop_core::apply_inplace_schur(Cube& out, const eOpCube& x) @@ -927,7 +925,7 @@ eop_core::apply_inplace_schur(Cube& out, const template template -arma_hot + inline void eop_core::apply_inplace_div(Cube& out, const eOpCube& x) diff --git a/include/armadillo_bits/field_bones.hpp b/include/armadillo_bits/field_bones.hpp index e630d1c3..1577e0af 100644 --- a/include/armadillo_bits/field_bones.hpp +++ b/include/armadillo_bits/field_bones.hpp @@ -88,43 +88,43 @@ class field template inline void copy_size(const field& x); - arma_inline arma_warn_unused oT& operator[](const uword i); - arma_inline arma_warn_unused const oT& operator[](const uword i) const; + arma_warn_unused arma_inline oT& operator[](const uword i); + arma_warn_unused arma_inline const oT& operator[](const uword i) const; - arma_inline arma_warn_unused oT& at(const uword i); - arma_inline arma_warn_unused const oT& at(const uword i) const; + arma_warn_unused arma_inline oT& at(const uword i); + arma_warn_unused arma_inline const oT& at(const uword i) const; - arma_inline arma_warn_unused oT& operator()(const uword i); - arma_inline arma_warn_unused const oT& operator()(const uword i) const; + arma_warn_unused arma_inline oT& operator()(const uword i); + arma_warn_unused arma_inline const oT& operator()(const uword i) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused oT& operator[](const uword row, const uword col); - arma_inline arma_warn_unused const oT& operator[](const uword row, const uword col) const; + arma_warn_unused arma_inline oT& operator[](const uword row, const uword col); + arma_warn_unused arma_inline const oT& operator[](const uword row, const uword col) const; #endif - arma_inline arma_warn_unused oT& at(const uword row, const uword col); - arma_inline arma_warn_unused const oT& at(const uword row, const uword col) const; + arma_warn_unused arma_inline oT& at(const uword row, const uword col); + arma_warn_unused arma_inline const oT& at(const uword row, const uword col) const; #if defined(__cpp_multidimensional_subscript) - arma_inline arma_warn_unused oT& operator[](const uword row, const uword col, const uword slice); - arma_inline arma_warn_unused const oT& operator[](const uword row, const uword col, const uword slice) const; + arma_warn_unused arma_inline oT& operator[](const uword row, const uword col, const uword slice); + arma_warn_unused arma_inline const oT& operator[](const uword row, const uword col, const uword slice) const; #endif - arma_inline arma_warn_unused oT& at(const uword row, const uword col, const uword slice); - arma_inline arma_warn_unused const oT& at(const uword row, const uword col, const uword slice) const; + arma_warn_unused arma_inline oT& at(const uword row, const uword col, const uword slice); + arma_warn_unused arma_inline const oT& at(const uword row, const uword col, const uword slice) const; - arma_inline arma_warn_unused oT& operator()(const uword row, const uword col); - arma_inline arma_warn_unused const oT& operator()(const uword row, const uword col) const; + arma_warn_unused arma_inline oT& operator()(const uword row, const uword col); + arma_warn_unused arma_inline const oT& operator()(const uword row, const uword col) const; - arma_inline arma_warn_unused oT& operator()(const uword row, const uword col, const uword slice); - arma_inline arma_warn_unused const oT& operator()(const uword row, const uword col, const uword slice) const; + arma_warn_unused arma_inline oT& operator()(const uword row, const uword col, const uword slice); + arma_warn_unused arma_inline const oT& operator()(const uword row, const uword col, const uword slice) const; - arma_inline arma_warn_unused oT& front(); - arma_inline arma_warn_unused const oT& front() const; + arma_warn_unused arma_inline oT& front(); + arma_warn_unused arma_inline const oT& front() const; - arma_inline arma_warn_unused oT& back(); - arma_inline arma_warn_unused const oT& back() const; + arma_warn_unused arma_inline oT& back(); + arma_warn_unused arma_inline const oT& back() const; arma_frown("use braced initialiser list instead") inline field_injector operator<<(const oT& val); @@ -194,27 +194,27 @@ class field arma_inline bool is_empty() const; - arma_inline arma_warn_unused bool in_range(const uword i) const; - arma_inline arma_warn_unused bool in_range(const span& x) const; + arma_warn_unused arma_inline bool in_range(const uword i) const; + arma_warn_unused arma_inline bool in_range(const span& x) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const uword in_col) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const uword in_col) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const span& col_span) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const SizeMat& s) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice) const; - arma_inline arma_warn_unused bool in_range(const span& row_span, const span& col_span, const span& slice_span) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice) const; + arma_warn_unused arma_inline bool in_range(const span& row_span, const span& col_span, const span& slice_span) const; - arma_inline arma_warn_unused bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const; + arma_warn_unused arma_inline bool in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const; - inline arma_cold bool save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool save( std::ostream& os, const file_type type = arma_binary) const; + arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const; + arma_cold inline bool save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool load(const std::string name, const file_type type = auto_detect); - inline arma_cold bool load( std::istream& is, const file_type type = auto_detect); + arma_cold inline bool load(const std::string name, const file_type type = auto_detect); + arma_cold inline bool load( std::istream& is, const file_type type = auto_detect); arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; diff --git a/include/armadillo_bits/field_meat.hpp b/include/armadillo_bits/field_meat.hpp index e9fe8365..8556c4d9 100644 --- a/include/armadillo_bits/field_meat.hpp +++ b/include/armadillo_bits/field_meat.hpp @@ -474,7 +474,6 @@ field::copy_size(const field& x) //! linear element accessor (treats the field as a vector); no bounds check template arma_inline -arma_warn_unused oT& field::operator[] (const uword i) { @@ -486,7 +485,6 @@ field::operator[] (const uword i) //! linear element accessor (treats the field as a vector); no bounds check template arma_inline -arma_warn_unused const oT& field::operator[] (const uword i) const { @@ -498,7 +496,6 @@ field::operator[] (const uword i) const //! linear element accessor (treats the field as a vector); no bounds check template arma_inline -arma_warn_unused oT& field::at(const uword i) { @@ -510,7 +507,6 @@ field::at(const uword i) //! linear element accessor (treats the field as a vector); no bounds check template arma_inline -arma_warn_unused const oT& field::at(const uword i) const { @@ -522,7 +518,6 @@ field::at(const uword i) const //! linear element accessor (treats the field as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused oT& field::operator() (const uword i) { @@ -536,7 +531,6 @@ field::operator() (const uword i) //! linear element accessor (treats the field as a vector); bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const oT& field::operator() (const uword i) const { @@ -550,7 +544,6 @@ field::operator() (const uword i) const //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused oT& field::operator() (const uword in_row, const uword in_col) { @@ -564,7 +557,6 @@ field::operator() (const uword in_row, const uword in_col) //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const oT& field::operator() (const uword in_row, const uword in_col) const { @@ -578,7 +570,6 @@ field::operator() (const uword in_row, const uword in_col) const //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused oT& field::operator() (const uword in_row, const uword in_col, const uword in_slice) { @@ -592,7 +583,6 @@ field::operator() (const uword in_row, const uword in_col, const uword in_sl //! element accessor; bounds checking not done when ARMA_NO_DEBUG is defined template arma_inline -arma_warn_unused const oT& field::operator() (const uword in_row, const uword in_col, const uword in_slice) const { @@ -608,8 +598,7 @@ field::operator() (const uword in_row, const uword in_col, const uword in_sl //! element accessor; no bounds check template arma_inline - arma_warn_unused - oT& + oT& field::operator[] (const uword in_row, const uword in_col) { return (*mem[in_row + in_col*n_rows]); @@ -620,8 +609,7 @@ field::operator() (const uword in_row, const uword in_col, const uword in_sl //! element accessor; no bounds check template arma_inline - arma_warn_unused - const oT& + const oT& field::operator[] (const uword in_row, const uword in_col) const { return (*mem[in_row + in_col*n_rows]); @@ -634,7 +622,6 @@ field::operator() (const uword in_row, const uword in_col, const uword in_sl //! element accessor; no bounds check template arma_inline -arma_warn_unused oT& field::at(const uword in_row, const uword in_col) { @@ -646,7 +633,6 @@ field::at(const uword in_row, const uword in_col) //! element accessor; no bounds check template arma_inline -arma_warn_unused const oT& field::at(const uword in_row, const uword in_col) const { @@ -660,8 +646,7 @@ field::at(const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline - arma_warn_unused - oT& + oT& field::operator[] (const uword in_row, const uword in_col, const uword in_slice) { return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]); @@ -672,8 +657,7 @@ field::at(const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline - arma_warn_unused - const oT& + const oT& field::operator[] (const uword in_row, const uword in_col, const uword in_slice) const { return (*mem[in_row + in_col*n_rows + in_slice*(n_rows*n_cols)]); @@ -686,7 +670,6 @@ field::at(const uword in_row, const uword in_col) const //! element accessor; no bounds check template arma_inline -arma_warn_unused oT& field::at(const uword in_row, const uword in_col, const uword in_slice) { @@ -698,7 +681,6 @@ field::at(const uword in_row, const uword in_col, const uword in_slice) //! element accessor; no bounds check template arma_inline -arma_warn_unused const oT& field::at(const uword in_row, const uword in_col, const uword in_slice) const { @@ -709,7 +691,6 @@ field::at(const uword in_row, const uword in_col, const uword in_slice) cons template arma_inline -arma_warn_unused oT& field::front() { @@ -722,7 +703,6 @@ field::front() template arma_inline -arma_warn_unused const oT& field::front() const { @@ -735,7 +715,6 @@ field::front() const template arma_inline -arma_warn_unused oT& field::back() { @@ -748,7 +727,6 @@ field::back() template arma_inline -arma_warn_unused const oT& field::back() const { @@ -1483,7 +1461,6 @@ field::operator()(const uword in_row1, const uword in_col1, const uword in_s //! has been defined. template -arma_cold inline void field::print(const std::string extra_text) const @@ -1514,7 +1491,6 @@ field::print(const std::string extra_text) const //! has been defined. template -arma_cold inline void field::print(std::ostream& user_stream, const std::string extra_text) const @@ -1621,7 +1597,6 @@ field::is_empty() const //! returns true if the given index is currently in range template arma_inline -arma_warn_unused bool field::in_range(const uword i) const { @@ -1633,7 +1608,6 @@ field::in_range(const uword i) const //! returns true if the given start and end indices are currently in range template arma_inline -arma_warn_unused bool field::in_range(const span& x) const { @@ -1657,7 +1631,6 @@ field::in_range(const span& x) const //! returns true if the given location is currently in range template arma_inline -arma_warn_unused bool field::in_range(const uword in_row, const uword in_col) const { @@ -1668,7 +1641,6 @@ field::in_range(const uword in_row, const uword in_col) const template arma_inline -arma_warn_unused bool field::in_range(const span& row_span, const uword in_col) const { @@ -1691,7 +1663,6 @@ field::in_range(const span& row_span, const uword in_col) const template arma_inline -arma_warn_unused bool field::in_range(const uword in_row, const span& col_span) const { @@ -1714,7 +1685,6 @@ field::in_range(const uword in_row, const span& col_span) const template arma_inline -arma_warn_unused bool field::in_range(const span& row_span, const span& col_span) const { @@ -1736,7 +1706,6 @@ field::in_range(const span& row_span, const span& col_span) const template arma_inline -arma_warn_unused bool field::in_range(const uword in_row, const uword in_col, const SizeMat& s) const { @@ -1757,7 +1726,6 @@ field::in_range(const uword in_row, const uword in_col, const SizeMat& s) co template arma_inline -arma_warn_unused bool field::in_range(const uword in_row, const uword in_col, const uword in_slice) const { @@ -1768,7 +1736,6 @@ field::in_range(const uword in_row, const uword in_col, const uword in_slice template arma_inline -arma_warn_unused bool field::in_range(const span& row_span, const span& col_span, const span& slice_span) const { @@ -1794,7 +1761,6 @@ field::in_range(const span& row_span, const span& col_span, const span& slic template arma_inline -arma_warn_unused bool field::in_range(const uword in_row, const uword in_col, const uword in_slice, const SizeCube& s) const { @@ -1816,7 +1782,6 @@ field::in_range(const uword in_row, const uword in_col, const uword in_slice template inline -arma_cold bool field::save(const std::string name, const file_type type) const { @@ -1845,7 +1810,6 @@ field::save(const std::string name, const file_type type) const template inline -arma_cold bool field::save(std::ostream& os, const file_type type) const { @@ -1874,7 +1838,6 @@ field::save(std::ostream& os, const file_type type) const template inline -arma_cold bool field::load(const std::string name, const file_type type) { @@ -1905,7 +1868,6 @@ field::load(const std::string name, const file_type type) template inline -arma_cold bool field::load(std::istream& is, const file_type type) { diff --git a/include/armadillo_bits/fn_log_det.hpp b/include/armadillo_bits/fn_log_det.hpp index 44f9018e..3ea463ec 100644 --- a/include/armadillo_bits/fn_log_det.hpp +++ b/include/armadillo_bits/fn_log_det.hpp @@ -55,8 +55,8 @@ log_det template -inline arma_warn_unused +inline std::complex log_det ( @@ -124,8 +124,8 @@ log_det_sympd template -inline arma_warn_unused +inline typename T1::pod_type log_det_sympd ( diff --git a/include/armadillo_bits/fn_log_normpdf.hpp b/include/armadillo_bits/fn_log_normpdf.hpp index 5f8a4803..cb404db6 100644 --- a/include/armadillo_bits/fn_log_normpdf.hpp +++ b/include/armadillo_bits/fn_log_normpdf.hpp @@ -92,8 +92,8 @@ log_normpdf_helper(Mat& out, const Base -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result log_normpdf(const eT x) { @@ -105,8 +105,8 @@ log_normpdf(const eT x) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result log_normpdf(const eT x, const eT mu, const eT sigma) { @@ -120,8 +120,8 @@ log_normpdf(const eT x, const eT mu, const eT sigma) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result log_normpdf(const eT x, const Base& M_expr, const Base& S_expr) { @@ -140,8 +140,8 @@ log_normpdf(const eT x, const Base& M_expr, const Base& S_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result log_normpdf(const Base& X_expr) { @@ -162,8 +162,8 @@ log_normpdf(const Base& X_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result log_normpdf(const Base& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma) { @@ -184,8 +184,8 @@ log_normpdf(const Base& X_expr, const typename T1::e template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result log_normpdf(const Base& X_expr, const Base& M_expr, const Base& S_expr) { diff --git a/include/armadillo_bits/fn_norm.hpp b/include/armadillo_bits/fn_norm.hpp index 3dbcdb0f..fa49e009 100644 --- a/include/armadillo_bits/fn_norm.hpp +++ b/include/armadillo_bits/fn_norm.hpp @@ -22,8 +22,8 @@ template -inline arma_warn_unused +inline typename enable_if2< is_arma_type::value, typename T1::pod_type >::result norm ( @@ -68,8 +68,8 @@ norm template -inline arma_warn_unused +inline typename enable_if2< is_arma_type::value, typename T1::pod_type >::result norm ( @@ -121,8 +121,8 @@ norm template -inline arma_warn_unused +inline typename enable_if2< is_arma_type::value, double >::result norm ( @@ -143,8 +143,8 @@ norm template -inline arma_warn_unused +inline typename enable_if2< is_arma_type::value, double >::result norm ( @@ -169,8 +169,8 @@ norm template -inline arma_warn_unused +inline typename enable_if2< is_arma_sparse_type::value, typename T1::pod_type >::result norm ( @@ -224,8 +224,8 @@ norm template -inline arma_warn_unused +inline typename enable_if2< is_arma_sparse_type::value, typename T1::pod_type >::result norm ( diff --git a/include/armadillo_bits/fn_normcdf.hpp b/include/armadillo_bits/fn_normcdf.hpp index 8fdab5f9..06ed5cb8 100644 --- a/include/armadillo_bits/fn_normcdf.hpp +++ b/include/armadillo_bits/fn_normcdf.hpp @@ -88,8 +88,8 @@ normcdf_helper(Mat& out, const Base -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result normcdf(const eT x) { @@ -101,8 +101,8 @@ normcdf(const eT x) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result normcdf(const eT x, const eT mu, const eT sigma) { @@ -116,8 +116,8 @@ normcdf(const eT x, const eT mu, const eT sigma) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normcdf(const eT x, const Base& M_expr, const Base& S_expr) { @@ -136,8 +136,8 @@ normcdf(const eT x, const Base& M_expr, const Base& S_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normcdf(const Base& X_expr) { @@ -158,8 +158,8 @@ normcdf(const Base& X_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normcdf(const Base& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma) { @@ -180,8 +180,8 @@ normcdf(const Base& X_expr, const typename T1::elem_ template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normcdf(const Base& X_expr, const Base& M_expr, const Base& S_expr) { diff --git a/include/armadillo_bits/fn_normpdf.hpp b/include/armadillo_bits/fn_normpdf.hpp index b9fb9bc1..e05af41b 100644 --- a/include/armadillo_bits/fn_normpdf.hpp +++ b/include/armadillo_bits/fn_normpdf.hpp @@ -92,8 +92,8 @@ normpdf_helper(Mat& out, const Base -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result normpdf(const eT x) { @@ -105,8 +105,8 @@ normpdf(const eT x) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), eT >::result normpdf(const eT x, const eT mu, const eT sigma) { @@ -120,8 +120,8 @@ normpdf(const eT x, const eT mu, const eT sigma) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normpdf(const eT x, const Base& M_expr, const Base& S_expr) { @@ -140,8 +140,8 @@ normpdf(const eT x, const Base& M_expr, const Base& S_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normpdf(const Base& X_expr) { @@ -162,8 +162,8 @@ normpdf(const Base& X_expr) template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normpdf(const Base& X_expr, const typename T1::elem_type mu, const typename T1::elem_type sigma) { @@ -184,8 +184,8 @@ normpdf(const Base& X_expr, const typename T1::elem_ template -inline arma_warn_unused +inline typename enable_if2< (is_real::value), Mat >::result normpdf(const Base& X_expr, const Base& M_expr, const Base& S_expr) { diff --git a/include/armadillo_bits/glue_times_meat.hpp b/include/armadillo_bits/glue_times_meat.hpp index b88670cd..0dc8a02e 100644 --- a/include/armadillo_bits/glue_times_meat.hpp +++ b/include/armadillo_bits/glue_times_meat.hpp @@ -23,7 +23,6 @@ template template -arma_hot inline void glue_times_redirect2_helper::apply(Mat& out, const Glue& X) @@ -74,7 +73,6 @@ glue_times_redirect2_helper::apply(Mat& o template -arma_hot inline void glue_times_redirect2_helper::apply(Mat& out, const Glue& X) @@ -160,7 +158,6 @@ glue_times_redirect2_helper::apply(Mat& out, const template template -arma_hot inline void glue_times_redirect3_helper::apply(Mat& out, const Glue< Glue, T3, glue_times>& X) @@ -218,7 +215,6 @@ glue_times_redirect3_helper::apply(Mat& o template -arma_hot inline void glue_times_redirect3_helper::apply(Mat& out, const Glue< Glue, T3, glue_times>& X) @@ -340,7 +336,6 @@ glue_times_redirect3_helper::apply(Mat& out, const template template -arma_hot inline void glue_times_redirect::apply(Mat& out, const Glue& X) @@ -391,7 +386,6 @@ glue_times_redirect::apply(Mat& out, const Glue -arma_hot inline void glue_times_redirect<2>::apply(Mat& out, const Glue& X) @@ -406,7 +400,6 @@ glue_times_redirect<2>::apply(Mat& out, const Glue -arma_hot inline void glue_times_redirect<3>::apply(Mat& out, const Glue< Glue, T3, glue_times>& X) @@ -421,7 +414,6 @@ glue_times_redirect<3>::apply(Mat& out, const Glue< Glue template -arma_hot inline void glue_times_redirect<4>::apply(Mat& out, const Glue< Glue< Glue, T3, glue_times>, T4, glue_times>& X) @@ -483,7 +475,6 @@ glue_times_redirect<4>::apply(Mat& out, const Glue< Glue template -arma_hot inline void glue_times::apply(Mat& out, const Glue& X) @@ -500,7 +491,6 @@ glue_times::apply(Mat& out, const Glue template -arma_hot inline void glue_times::apply_inplace(Mat& out, const T1& X) @@ -513,7 +503,6 @@ glue_times::apply_inplace(Mat& out, const T1& X) template -arma_hot inline void glue_times::apply_inplace_plus(Mat& out, const Glue& X, const sword sign) @@ -646,7 +635,6 @@ template typename TA, typename TB > -arma_hot inline void glue_times::apply @@ -745,7 +733,6 @@ template typename TB, typename TC > -arma_hot inline void glue_times::apply @@ -795,7 +782,6 @@ template typename TC, typename TD > -arma_hot inline void glue_times::apply @@ -840,7 +826,6 @@ glue_times::apply template -arma_hot inline void glue_times_diag::apply(Mat& actual_out, const Glue& X) diff --git a/include/armadillo_bits/gmm_diag_meat.hpp b/include/armadillo_bits/gmm_diag_meat.hpp index 41c94cbc..cd2a57c9 100644 --- a/include/armadillo_bits/gmm_diag_meat.hpp +++ b/include/armadillo_bits/gmm_diag_meat.hpp @@ -1052,7 +1052,6 @@ gmm_diag::internal_gen_boundaries(const uword N) const template -arma_hot inline eT gmm_diag::internal_scalar_log_p(const eT* x) const @@ -1085,7 +1084,6 @@ gmm_diag::internal_scalar_log_p(const eT* x) const template -arma_hot inline eT gmm_diag::internal_scalar_log_p(const eT* x, const uword g) const diff --git a/include/armadillo_bits/gmm_misc_meat.hpp b/include/armadillo_bits/gmm_misc_meat.hpp index 9dab2919..3276b46f 100644 --- a/include/armadillo_bits/gmm_misc_meat.hpp +++ b/include/armadillo_bits/gmm_misc_meat.hpp @@ -62,7 +62,6 @@ running_mean_scalar::operator=(const running_mean_scalar& in) template -arma_hot inline void running_mean_scalar::operator() (const eT X) diff --git a/include/armadillo_bits/injector_meat.hpp b/include/armadillo_bits/injector_meat.hpp index d509896d..78f25bd2 100644 --- a/include/armadillo_bits/injector_meat.hpp +++ b/include/armadillo_bits/injector_meat.hpp @@ -22,7 +22,6 @@ template -arma_cold inline mat_injector_row::mat_injector_row() : n_cols(0) @@ -35,7 +34,6 @@ mat_injector_row::mat_injector_row() template -arma_cold inline void mat_injector_row::insert(const eT val) const @@ -70,7 +68,6 @@ mat_injector_row::insert(const eT val) const template -arma_cold inline mat_injector::mat_injector(T1& in_X, const typename mat_injector::elem_type val) : X(in_X) @@ -98,7 +95,6 @@ mat_injector::mat_injector(T1& in_X, const typename mat_injector::elem_t template -arma_cold inline mat_injector::mat_injector(T1& in_X, const injector_end_of_row<>& x) : X(in_X) @@ -127,7 +123,6 @@ mat_injector::mat_injector(T1& in_X, const injector_end_of_row<>& x) template -arma_cold inline mat_injector::~mat_injector() { @@ -226,7 +221,6 @@ mat_injector::~mat_injector() template -arma_cold inline void mat_injector::insert(const typename mat_injector::elem_type val) const @@ -244,7 +238,6 @@ mat_injector::insert(const typename mat_injector::elem_type val) const template -arma_cold inline void mat_injector::end_of_row() const @@ -273,7 +266,6 @@ mat_injector::end_of_row() const template -arma_cold inline const mat_injector& operator<<(const mat_injector& ref, const typename mat_injector::elem_type val) @@ -288,7 +280,6 @@ operator<<(const mat_injector& ref, const typename mat_injector::elem_ty template -arma_cold inline const mat_injector& operator<<(const mat_injector& ref, const injector_end_of_row<>& x) @@ -345,7 +336,6 @@ operator<<(const mat_injector& ref, const injector_end_of_row<>& x) template -arma_cold inline field_injector_row::field_injector_row() : n_cols(0) @@ -363,7 +353,6 @@ field_injector_row::field_injector_row() template -arma_cold inline field_injector_row::~field_injector_row() { @@ -376,7 +365,6 @@ field_injector_row::~field_injector_row() template -arma_cold inline void field_injector_row::insert(const oT& val) const @@ -415,7 +403,6 @@ field_injector_row::insert(const oT& val) const template -arma_cold inline field_injector::field_injector(T1& in_X, const typename field_injector::object_type& val) : X(in_X) @@ -443,7 +430,6 @@ field_injector::field_injector(T1& in_X, const typename field_injector:: template -arma_cold inline field_injector::field_injector(T1& in_X, const injector_end_of_row<>& x) : X(in_X) @@ -472,7 +458,6 @@ field_injector::field_injector(T1& in_X, const injector_end_of_row<>& x) template -arma_cold inline field_injector::~field_injector() { @@ -530,7 +515,6 @@ field_injector::~field_injector() template -arma_cold inline void field_injector::insert(const typename field_injector::object_type& val) const @@ -548,7 +532,6 @@ field_injector::insert(const typename field_injector::object_type& val) template -arma_cold inline void field_injector::end_of_row() const @@ -580,7 +563,6 @@ field_injector::end_of_row() const template -arma_cold inline const field_injector& operator<<(const field_injector& ref, const typename field_injector::object_type& val) @@ -595,7 +577,6 @@ operator<<(const field_injector& ref, const typename field_injector::obj template -arma_cold inline const field_injector& operator<<(const field_injector& ref, const injector_end_of_row<>& x) diff --git a/include/armadillo_bits/op_det_meat.hpp b/include/armadillo_bits/op_det_meat.hpp index f676ada9..021cc872 100644 --- a/include/armadillo_bits/op_det_meat.hpp +++ b/include/armadillo_bits/op_det_meat.hpp @@ -137,7 +137,6 @@ op_det::apply_trimat(const Base& expr) template -arma_cold inline eT op_det::apply_tiny_2x2(const Mat& X) @@ -152,7 +151,6 @@ op_det::apply_tiny_2x2(const Mat& X) template -arma_cold inline eT op_det::apply_tiny_3x3(const Mat& X) @@ -179,7 +177,6 @@ op_det::apply_tiny_3x3(const Mat& X) template -arma_cold inline eT op_det::apply_tiny_4x4(const Mat& X) diff --git a/include/armadillo_bits/op_dot_meat.hpp b/include/armadillo_bits/op_dot_meat.hpp index 6d1d094f..2b21b6a0 100644 --- a/include/armadillo_bits/op_dot_meat.hpp +++ b/include/armadillo_bits/op_dot_meat.hpp @@ -67,7 +67,6 @@ op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B //! for two arrays, generic version for complex values template -arma_hot inline typename arma_cx_only::result op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B) @@ -101,7 +100,6 @@ op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B //! for two arrays, float and double version template -arma_hot inline typename arma_real_only::result op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) @@ -139,7 +137,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) //! for two arrays, complex version template inline -arma_hot typename arma_cx_only::result op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) { @@ -173,7 +170,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) //! for two arrays, integral version template -arma_hot inline typename arma_integral_only::result op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) @@ -186,7 +182,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B) //! for three arrays template -arma_hot inline eT op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B, const eT* C) @@ -206,7 +201,6 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B, con template -arma_hot inline typename T1::elem_type op_dot::apply(const T1& X, const T2& Y) @@ -266,7 +260,6 @@ op_dot::apply(const T1& X, const T2& Y) template -arma_hot inline typename arma_not_cx::result op_dot::apply_proxy(const Proxy& PA, const Proxy& PB) @@ -304,7 +297,6 @@ op_dot::apply_proxy(const Proxy& PA, const Proxy& PB) template -arma_hot inline typename arma_cx_only::result op_dot::apply_proxy(const Proxy& PA, const Proxy& PB) @@ -351,7 +343,6 @@ op_dot::apply_proxy(const Proxy& PA, const Proxy& PB) template -arma_hot inline typename T1::elem_type op_norm_dot::apply(const T1& X, const T2& Y) @@ -382,7 +373,6 @@ op_norm_dot::apply(const T1& X, const T2& Y) template -arma_hot inline eT op_cdot::direct_cdot_arma(const uword n_elem, const eT* const A, const eT* const B) @@ -415,7 +405,6 @@ op_cdot::direct_cdot_arma(const uword n_elem, const eT* const A, const eT* const template -arma_hot inline eT op_cdot::direct_cdot(const uword n_elem, const eT* const A, const eT* const B) @@ -462,7 +451,6 @@ op_cdot::direct_cdot(const uword n_elem, const eT* const A, const eT* const B) template -arma_hot inline typename T1::elem_type op_cdot::apply(const T1& X, const T2& Y) @@ -482,7 +470,6 @@ op_cdot::apply(const T1& X, const T2& Y) template -arma_hot inline typename T1::elem_type op_cdot::apply_unwrap(const T1& X, const T2& Y) @@ -505,7 +492,6 @@ op_cdot::apply_unwrap(const T1& X, const T2& Y) template -arma_hot inline typename T1::elem_type op_cdot::apply_proxy(const T1& X, const T2& Y) @@ -561,7 +547,6 @@ op_cdot::apply_proxy(const T1& X, const T2& Y) template -arma_hot inline typename promote_type::result op_dot_mixed::apply(const T1& A, const T2& B) diff --git a/include/armadillo_bits/op_htrans_meat.hpp b/include/armadillo_bits/op_htrans_meat.hpp index 4b9ed3eb..e03893c8 100644 --- a/include/armadillo_bits/op_htrans_meat.hpp +++ b/include/armadillo_bits/op_htrans_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void op_htrans::apply_mat_noalias(Mat& out, const Mat& A, const typename arma_not_cx::result* junk) @@ -36,7 +35,6 @@ op_htrans::apply_mat_noalias(Mat& out, const Mat& A, const typename arma template -arma_hot inline void op_htrans::apply_mat_noalias(Mat& out, const Mat& A, const typename arma_cx_only::result* junk) @@ -88,7 +86,6 @@ op_htrans::apply_mat_noalias(Mat& out, const Mat& A, const typename arma template -arma_hot inline void op_htrans::block_worker(std::complex* Y, const std::complex* X, const uword X_n_rows, const uword Y_n_rows, const uword n_rows, const uword n_cols) @@ -109,7 +106,6 @@ op_htrans::block_worker(std::complex* Y, const std::complex* X, const uwor template -arma_hot inline void op_htrans::apply_mat_noalias_large(Mat< std::complex >& out, const Mat< std::complex >& A) @@ -165,7 +161,6 @@ op_htrans::apply_mat_noalias_large(Mat< std::complex >& out, const Mat< std:: template -arma_hot inline void op_htrans::apply_mat_inplace(Mat& out, const typename arma_not_cx::result* junk) @@ -179,7 +174,6 @@ op_htrans::apply_mat_inplace(Mat& out, const typename arma_not_cx::resul template -arma_hot inline void op_htrans::apply_mat_inplace(Mat& out, const typename arma_cx_only::result* junk) diff --git a/include/armadillo_bits/op_inv_gen_meat.hpp b/include/armadillo_bits/op_inv_gen_meat.hpp index 703855f8..1e50243c 100644 --- a/include/armadillo_bits/op_inv_gen_meat.hpp +++ b/include/armadillo_bits/op_inv_gen_meat.hpp @@ -256,7 +256,6 @@ op_inv_gen_full::apply_direct(Mat& out, const Base -arma_cold inline bool op_inv_gen_full::apply_tiny_2x2(Mat& X) @@ -293,7 +292,6 @@ op_inv_gen_full::apply_tiny_2x2(Mat& X) template -arma_cold inline bool op_inv_gen_full::apply_tiny_3x3(Mat& X) @@ -343,7 +341,6 @@ op_inv_gen_full::apply_tiny_3x3(Mat& X) template -arma_cold inline bool op_inv_gen_full::apply_tiny_4x4(Mat& X) diff --git a/include/armadillo_bits/op_inv_spd_meat.hpp b/include/armadillo_bits/op_inv_spd_meat.hpp index 49011848..c88b6641 100644 --- a/include/armadillo_bits/op_inv_spd_meat.hpp +++ b/include/armadillo_bits/op_inv_spd_meat.hpp @@ -237,7 +237,6 @@ op_inv_spd_full::apply_direct(Mat& out, const Base -arma_cold inline bool op_inv_spd_full::apply_tiny_2x2(Mat& X) @@ -285,7 +284,6 @@ op_inv_spd_full::apply_tiny_2x2(Mat& X) template -arma_cold inline bool op_inv_spd_full::apply_tiny_3x3(Mat& X) @@ -316,7 +314,6 @@ op_inv_spd_full::apply_tiny_3x3(Mat& X) template -arma_cold inline bool op_inv_spd_full::apply_tiny_4x4(Mat& X) diff --git a/include/armadillo_bits/op_mean_meat.hpp b/include/armadillo_bits/op_mean_meat.hpp index 86abf31a..6c216f14 100644 --- a/include/armadillo_bits/op_mean_meat.hpp +++ b/include/armadillo_bits/op_mean_meat.hpp @@ -136,7 +136,6 @@ op_mean::apply_noalias_unwrap(Mat& out, const Proxy& template -arma_hot inline void op_mean::apply_noalias_proxy(Mat& out, const Proxy& P, const uword dim) @@ -365,7 +364,6 @@ op_mean::apply_noalias_unwrap(Cube& out, const ProxyCube template -arma_hot inline void op_mean::apply_noalias_proxy(Cube& out, const ProxyCube& P, const uword dim) diff --git a/include/armadillo_bits/op_norm_meat.hpp b/include/armadillo_bits/op_norm_meat.hpp index 658c7656..463075e1 100644 --- a/include/armadillo_bits/op_norm_meat.hpp +++ b/include/armadillo_bits/op_norm_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline typename T1::pod_type op_norm::vec_norm_1(const Proxy& P, const typename arma_not_cx::result* junk) @@ -109,7 +108,6 @@ op_norm::vec_norm_1(const Proxy& P, const typename arma_not_cx -arma_hot inline typename T1::pod_type op_norm::vec_norm_1(const Proxy& P, const typename arma_cx_only::result* junk) @@ -217,7 +215,6 @@ op_norm::vec_norm_1(const Proxy& P, const typename arma_cx_only -arma_hot inline eT op_norm::vec_norm_1_direct_std(const Mat& X) @@ -252,7 +249,6 @@ op_norm::vec_norm_1_direct_std(const Mat& X) template -arma_hot inline eT op_norm::vec_norm_1_direct_mem(const uword N, const eT* A) @@ -305,7 +301,6 @@ op_norm::vec_norm_1_direct_mem(const uword N, const eT* A) template -arma_hot inline typename T1::pod_type op_norm::vec_norm_2(const Proxy& P, const typename arma_not_cx::result* junk) @@ -413,7 +408,6 @@ op_norm::vec_norm_2(const Proxy& P, const typename arma_not_cx -arma_hot inline typename T1::pod_type op_norm::vec_norm_2(const Proxy& P, const typename arma_cx_only::result* junk) @@ -516,7 +510,6 @@ op_norm::vec_norm_2(const Proxy& P, const typename arma_cx_only -arma_hot inline eT op_norm::vec_norm_2_direct_std(const Mat& X) @@ -564,7 +557,6 @@ op_norm::vec_norm_2_direct_std(const Mat& X) template -arma_hot inline eT op_norm::vec_norm_2_direct_mem(const uword N, const eT* A) @@ -623,7 +615,6 @@ op_norm::vec_norm_2_direct_mem(const uword N, const eT* A) template -arma_hot inline eT op_norm::vec_norm_2_direct_robust(const Mat& X) @@ -688,7 +679,6 @@ op_norm::vec_norm_2_direct_robust(const Mat& X) template -arma_hot inline typename T1::pod_type op_norm::vec_norm_k(const Proxy& P, const int k) @@ -738,7 +728,6 @@ op_norm::vec_norm_k(const Proxy& P, const int k) template -arma_hot inline typename T1::pod_type op_norm::vec_norm_max(const Proxy& P) @@ -804,7 +793,6 @@ op_norm::vec_norm_max(const Proxy& P) template -arma_hot inline typename T1::pod_type op_norm::vec_norm_min(const Proxy& P) diff --git a/include/armadillo_bits/op_strans_meat.hpp b/include/armadillo_bits/op_strans_meat.hpp index 519f8b1d..ed02d3be 100644 --- a/include/armadillo_bits/op_strans_meat.hpp +++ b/include/armadillo_bits/op_strans_meat.hpp @@ -23,7 +23,6 @@ //! for tiny square matrices (size <= 4x4) template -arma_cold inline void op_strans::apply_mat_noalias_tinysq(Mat& out, const TA& A) @@ -98,7 +97,6 @@ op_strans::apply_mat_noalias_tinysq(Mat& out, const TA& A) template -arma_hot inline void op_strans::block_worker(eT* Y, const eT* X, const uword X_n_rows, const uword Y_n_rows, const uword n_rows, const uword n_cols) @@ -119,7 +117,6 @@ op_strans::block_worker(eT* Y, const eT* X, const uword X_n_rows, const uword Y_ template -arma_hot inline void op_strans::apply_mat_noalias_large(Mat& out, const Mat& A) @@ -176,7 +173,6 @@ op_strans::apply_mat_noalias_large(Mat& out, const Mat& A) //! Immediate transpose of a dense matrix template -arma_hot inline void op_strans::apply_mat_noalias(Mat& out, const TA& A) @@ -233,7 +229,6 @@ op_strans::apply_mat_noalias(Mat& out, const TA& A) template -arma_hot inline void op_strans::apply_mat_inplace(Mat& out) diff --git a/include/armadillo_bits/op_sum_meat.hpp b/include/armadillo_bits/op_sum_meat.hpp index b6b57b53..f759daaf 100644 --- a/include/armadillo_bits/op_sum_meat.hpp +++ b/include/armadillo_bits/op_sum_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void op_sum::apply(Mat& out, const Op& in) @@ -53,7 +52,6 @@ op_sum::apply(Mat& out, const Op& in) template -arma_hot inline void op_sum::apply_noalias(Mat& out, const Proxy& P, const uword dim) @@ -73,7 +71,6 @@ op_sum::apply_noalias(Mat& out, const Proxy& P, cons template -arma_hot inline void op_sum::apply_noalias_unwrap(Mat& out, const Proxy& P, const uword dim) @@ -128,7 +125,6 @@ op_sum::apply_noalias_unwrap(Mat& out, const Proxy& template -arma_hot inline void op_sum::apply_noalias_proxy(Mat& out, const Proxy& P, const uword dim) @@ -239,7 +235,6 @@ op_sum::apply_noalias_proxy(Mat& out, const Proxy& P template -arma_hot inline void op_sum::apply(Cube& out, const OpCube& in) @@ -270,7 +265,6 @@ op_sum::apply(Cube& out, const OpCube& in) template -arma_hot inline void op_sum::apply_noalias(Cube& out, const ProxyCube& P, const uword dim) @@ -290,7 +284,6 @@ op_sum::apply_noalias(Cube& out, const ProxyCube& P, template -arma_hot inline void op_sum::apply_noalias_unwrap(Cube& out, const ProxyCube& P, const uword dim) @@ -355,7 +348,6 @@ op_sum::apply_noalias_unwrap(Cube& out, const ProxyCube< template -arma_hot inline void op_sum::apply_noalias_proxy(Cube& out, const ProxyCube& P, const uword dim) diff --git a/include/armadillo_bits/podarray_meat.hpp b/include/armadillo_bits/podarray_meat.hpp index c18f3786..c42f4576 100644 --- a/include/armadillo_bits/podarray_meat.hpp +++ b/include/armadillo_bits/podarray_meat.hpp @@ -21,7 +21,6 @@ template -arma_hot inline podarray::~podarray() { @@ -84,7 +83,6 @@ podarray::operator=(const podarray& x) template -arma_hot arma_inline podarray::podarray(const uword new_n_elem) : n_elem(new_n_elem) diff --git a/include/armadillo_bits/running_stat_vec_meat.hpp b/include/armadillo_bits/running_stat_vec_meat.hpp index 2b931d65..9a725b1f 100644 --- a/include/armadillo_bits/running_stat_vec_meat.hpp +++ b/include/armadillo_bits/running_stat_vec_meat.hpp @@ -84,7 +84,6 @@ running_stat_vec::operator=(const running_stat_vec& in_rsv) //! update statistics to reflect new sample template template -arma_hot inline void running_stat_vec::operator() (const Base::T, T1>& X) @@ -112,7 +111,6 @@ running_stat_vec::operator() (const Base template -arma_hot inline void running_stat_vec::operator() (const Base< std::complex::T>, T1>& X) diff --git a/include/armadillo_bits/spglue_merge_meat.hpp b/include/armadillo_bits/spglue_merge_meat.hpp index e3d65e5e..18339da3 100644 --- a/include/armadillo_bits/spglue_merge_meat.hpp +++ b/include/armadillo_bits/spglue_merge_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void spglue_merge::subview_merge(SpSubview& sv, const SpMat& B) @@ -195,7 +194,6 @@ spglue_merge::subview_merge(SpSubview& sv, const SpMat& B) template -arma_hot inline void spglue_merge::subview_merge(SpSubview& sv, const Mat& B) @@ -383,7 +381,6 @@ spglue_merge::subview_merge(SpSubview& sv, const Mat& B) template -arma_hot inline void spglue_merge::symmat_merge(SpMat& out, const SpMat& A, const SpMat& B) @@ -468,7 +465,6 @@ spglue_merge::symmat_merge(SpMat& out, const SpMat& A, const SpMat& template -arma_hot inline void spglue_merge::diagview_merge(SpMat& out, const SpMat& A, const SpMat& B) diff --git a/include/armadillo_bits/spglue_minus_meat.hpp b/include/armadillo_bits/spglue_minus_meat.hpp index 8a123bf7..1ad71610 100644 --- a/include/armadillo_bits/spglue_minus_meat.hpp +++ b/include/armadillo_bits/spglue_minus_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void spglue_minus::apply(SpMat& out, const SpGlue& X) @@ -53,7 +52,6 @@ spglue_minus::apply(SpMat& out, const SpGlue -arma_hot inline void spglue_minus::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy& pb) @@ -160,7 +158,6 @@ spglue_minus::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy template -arma_hot inline void spglue_minus::apply_noalias(SpMat& out, const SpMat& A, const SpMat& B) diff --git a/include/armadillo_bits/spglue_plus_meat.hpp b/include/armadillo_bits/spglue_plus_meat.hpp index cb38a808..b8eada0b 100644 --- a/include/armadillo_bits/spglue_plus_meat.hpp +++ b/include/armadillo_bits/spglue_plus_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void spglue_plus::apply(SpMat& out, const SpGlue& X) @@ -53,7 +52,6 @@ spglue_plus::apply(SpMat& out, const SpGlue -arma_hot inline void spglue_plus::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy& pb) @@ -160,7 +158,6 @@ spglue_plus::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy< template -arma_hot inline void spglue_plus::apply_noalias(SpMat& out, const SpMat& A, const SpMat& B) diff --git a/include/armadillo_bits/spglue_schur_meat.hpp b/include/armadillo_bits/spglue_schur_meat.hpp index 3fdab801..1ad8a8f9 100644 --- a/include/armadillo_bits/spglue_schur_meat.hpp +++ b/include/armadillo_bits/spglue_schur_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void spglue_schur::apply(SpMat& out, const SpGlue& X) @@ -53,7 +52,6 @@ spglue_schur::apply(SpMat& out, const SpGlue -arma_hot inline void spglue_schur::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy& pb) @@ -150,7 +148,6 @@ spglue_schur::apply_noalias(SpMat& out, const SpProxy& pa, const SpProxy template -arma_hot inline void spglue_schur::apply_noalias(SpMat& out, const SpMat& A, const SpMat& B) diff --git a/include/armadillo_bits/spglue_times_meat.hpp b/include/armadillo_bits/spglue_times_meat.hpp index a35eb4ca..b9bb6476 100644 --- a/include/armadillo_bits/spglue_times_meat.hpp +++ b/include/armadillo_bits/spglue_times_meat.hpp @@ -84,7 +84,6 @@ spglue_times::apply(SpMat& out, const SpGlue -arma_hot inline void spglue_times::apply_noalias(SpMat& c, const SpMat& x, const SpMat& y) diff --git a/include/armadillo_bits/spop_sum_meat.hpp b/include/armadillo_bits/spop_sum_meat.hpp index bb385b6b..63badfd9 100644 --- a/include/armadillo_bits/spop_sum_meat.hpp +++ b/include/armadillo_bits/spop_sum_meat.hpp @@ -22,7 +22,6 @@ template -arma_hot inline void spop_sum::apply(SpMat& out, const SpOp& in) diff --git a/include/armadillo_bits/subview_bones.hpp b/include/armadillo_bits/subview_bones.hpp index f4b4571a..cbcee85e 100644 --- a/include/armadillo_bits/subview_bones.hpp +++ b/include/armadillo_bits/subview_bones.hpp @@ -119,25 +119,25 @@ class subview : public Base< eT, subview > inline void randu(); inline void randn(); - inline arma_warn_unused eT at_alt (const uword ii) const; + arma_warn_unused inline eT at_alt (const uword ii) const; - inline arma_warn_unused eT& operator[](const uword ii); - inline arma_warn_unused eT operator[](const uword ii) const; + arma_warn_unused inline eT& operator[](const uword ii); + arma_warn_unused inline eT operator[](const uword ii) const; - inline arma_warn_unused eT& operator()(const uword ii); - inline arma_warn_unused eT operator()(const uword ii) const; + arma_warn_unused inline eT& operator()(const uword ii); + arma_warn_unused inline eT operator()(const uword ii) const; - inline arma_warn_unused eT& operator()(const uword in_row, const uword in_col); - inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const; + arma_warn_unused inline eT& operator()(const uword in_row, const uword in_col); + arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const; - inline arma_warn_unused eT& at(const uword in_row, const uword in_col); - inline arma_warn_unused eT at(const uword in_row, const uword in_col) const; + arma_warn_unused inline eT& at(const uword in_row, const uword in_col); + arma_warn_unused inline eT at(const uword in_row, const uword in_col) const; - inline arma_warn_unused eT& front(); - inline arma_warn_unused eT front() const; + arma_warn_unused inline eT& front(); + arma_warn_unused inline eT front() const; - inline arma_warn_unused eT& back(); - inline arma_warn_unused eT back() const; + arma_warn_unused inline eT& back(); + arma_warn_unused inline eT back() const; arma_inline eT* colptr(const uword in_col); arma_inline const eT* colptr(const uword in_col) const; @@ -145,12 +145,12 @@ class subview : public Base< eT, subview > template inline bool check_overlap(const subview& x) const; - inline arma_warn_unused bool is_vec() const; - inline arma_warn_unused bool is_finite() const; - inline arma_warn_unused bool is_zero(const pod_type tol = 0) const; + arma_warn_unused inline bool is_vec() const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused inline bool is_zero(const pod_type tol = 0) const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; inline subview_row row(const uword row_num); inline const subview_row row(const uword row_num) const; @@ -211,15 +211,15 @@ class subview : public Base< eT, subview > inline iterator(const iterator& X); inline iterator(subview& in_sv, const uword in_row, const uword in_col); - inline arma_warn_unused eT& operator*(); + arma_warn_unused inline eT& operator*(); - inline iterator& operator++(); - inline arma_warn_unused iterator operator++(int); + inline iterator& operator++(); + arma_warn_unused inline iterator operator++(int); - inline arma_warn_unused bool operator==(const iterator& rhs) const; - inline arma_warn_unused bool operator!=(const iterator& rhs) const; - inline arma_warn_unused bool operator==(const const_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_iterator& rhs) const; + arma_warn_unused inline bool operator==(const iterator& rhs) const; + arma_warn_unused inline bool operator!=(const iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_iterator& rhs) const; typedef std::forward_iterator_tag iterator_category; typedef eT value_type; @@ -246,15 +246,15 @@ class subview : public Base< eT, subview > inline const_iterator(const const_iterator& X); inline const_iterator(const subview& in_sv, const uword in_row, const uword in_col); - inline arma_warn_unused const eT& operator*(); + arma_warn_unused inline const eT& operator*(); - inline const_iterator& operator++(); - inline arma_warn_unused const_iterator operator++(int); + inline const_iterator& operator++(); + arma_warn_unused inline const_iterator operator++(int); - inline arma_warn_unused bool operator==(const iterator& rhs) const; - inline arma_warn_unused bool operator!=(const iterator& rhs) const; - inline arma_warn_unused bool operator==(const const_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_iterator& rhs) const; + arma_warn_unused inline bool operator==(const iterator& rhs) const; + arma_warn_unused inline bool operator!=(const iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_iterator& rhs) const; // So that we satisfy the STL iterator types. typedef std::forward_iterator_tag iterator_category; @@ -283,15 +283,15 @@ class subview : public Base< eT, subview > inline row_iterator(const row_iterator& X); inline row_iterator(subview& in_sv, const uword in_row, const uword in_col); - inline arma_warn_unused eT& operator* (); + arma_warn_unused inline eT& operator* (); - inline row_iterator& operator++(); - inline arma_warn_unused row_iterator operator++(int); + inline row_iterator& operator++(); + arma_warn_unused inline row_iterator operator++(int); - inline arma_warn_unused bool operator!=(const row_iterator& X) const; - inline arma_warn_unused bool operator==(const row_iterator& X) const; - inline arma_warn_unused bool operator!=(const const_row_iterator& X) const; - inline arma_warn_unused bool operator==(const const_row_iterator& X) const; + arma_warn_unused inline bool operator!=(const row_iterator& X) const; + arma_warn_unused inline bool operator==(const row_iterator& X) const; + arma_warn_unused inline bool operator!=(const const_row_iterator& X) const; + arma_warn_unused inline bool operator==(const const_row_iterator& X) const; typedef std::forward_iterator_tag iterator_category; typedef eT value_type; @@ -317,15 +317,15 @@ class subview : public Base< eT, subview > inline const_row_iterator(const const_row_iterator& X); inline const_row_iterator(const subview& in_sv, const uword in_row, const uword in_col); - inline arma_warn_unused const eT& operator*() const; + arma_warn_unused inline const eT& operator*() const; - inline const_row_iterator& operator++(); - inline arma_warn_unused const_row_iterator operator++(int); + inline const_row_iterator& operator++(); + arma_warn_unused inline const_row_iterator operator++(int); - inline arma_warn_unused bool operator!=(const row_iterator& X) const; - inline arma_warn_unused bool operator==(const row_iterator& X) const; - inline arma_warn_unused bool operator!=(const const_row_iterator& X) const; - inline arma_warn_unused bool operator==(const const_row_iterator& X) const; + arma_warn_unused inline bool operator!=(const row_iterator& X) const; + arma_warn_unused inline bool operator==(const row_iterator& X) const; + arma_warn_unused inline bool operator!=(const const_row_iterator& X) const; + arma_warn_unused inline bool operator==(const const_row_iterator& X) const; typedef std::forward_iterator_tag iterator_category; typedef eT value_type; @@ -382,11 +382,11 @@ class subview_col : public subview template inline typename enable_if2< is_same_type::value, void>::result operator=(const Gen& x); - arma_inline arma_warn_unused const Op,op_htrans> t() const; - arma_inline arma_warn_unused const Op,op_htrans> ht() const; - arma_inline arma_warn_unused const Op,op_strans> st() const; + arma_warn_unused arma_inline const Op,op_htrans> t() const; + arma_warn_unused arma_inline const Op,op_htrans> ht() const; + arma_warn_unused arma_inline const Op,op_strans> st() const; - arma_inline arma_warn_unused const Op,op_strans> as_row() const; + arma_warn_unused arma_inline const Op,op_strans> as_row() const; inline void fill(const eT val); inline void zeros(); @@ -424,14 +424,14 @@ class subview_col : public subview inline subview_col tail(const uword N); inline const subview_col tail(const uword N) const; - inline arma_warn_unused eT min() const; - inline arma_warn_unused eT max() const; + 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 arma_warn_unused uword index_min() const; - inline arma_warn_unused uword index_max() const; + arma_warn_unused inline uword index_min() const; + arma_warn_unused inline uword index_max() const; inline subview_col(const subview_col& in); inline subview_col( subview_col&& in); @@ -478,25 +478,25 @@ class subview_cols : public subview template inline typename enable_if2< is_same_type::value, void>::result operator=(const Gen& x); - arma_inline arma_warn_unused const Op,op_htrans> t() const; - arma_inline arma_warn_unused const Op,op_htrans> ht() const; - arma_inline arma_warn_unused const Op,op_strans> st() const; + arma_warn_unused arma_inline const Op,op_htrans> t() const; + arma_warn_unused arma_inline const Op,op_htrans> ht() const; + arma_warn_unused arma_inline const Op,op_strans> st() const; - arma_inline arma_warn_unused const Op,op_vectorise_col> as_col() const; + arma_warn_unused arma_inline const Op,op_vectorise_col> as_col() const; - inline arma_warn_unused eT at_alt (const uword ii) const; + arma_warn_unused inline eT at_alt (const uword ii) const; - inline arma_warn_unused eT& operator[](const uword ii); - inline arma_warn_unused eT operator[](const uword ii) const; + arma_warn_unused inline eT& operator[](const uword ii); + arma_warn_unused inline eT operator[](const uword ii) const; - inline arma_warn_unused eT& operator()(const uword ii); - inline arma_warn_unused eT operator()(const uword ii) const; + arma_warn_unused inline eT& operator()(const uword ii); + arma_warn_unused inline eT operator()(const uword ii) const; - inline arma_warn_unused eT& operator()(const uword in_row, const uword in_col); - inline arma_warn_unused eT operator()(const uword in_row, const uword in_col) const; + arma_warn_unused inline eT& operator()(const uword in_row, const uword in_col); + arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const; - inline arma_warn_unused eT& at(const uword in_row, const uword in_col); - inline arma_warn_unused eT at(const uword in_row, const uword in_col) const; + arma_warn_unused inline eT& at(const uword in_row, const uword in_col); + arma_warn_unused inline eT at(const uword in_row, const uword in_col) const; arma_inline eT* colptr(const uword in_col); arma_inline const eT* colptr(const uword in_col) const; @@ -535,11 +535,11 @@ class subview_row : public subview template inline typename enable_if2< is_same_type::value, void>::result operator=(const Gen& x); - arma_inline arma_warn_unused const Op,op_htrans> t() const; - arma_inline arma_warn_unused const Op,op_htrans> ht() const; - arma_inline arma_warn_unused const Op,op_strans> st() const; + arma_warn_unused arma_inline const Op,op_htrans> t() const; + arma_warn_unused arma_inline const Op,op_htrans> ht() const; + arma_warn_unused arma_inline const Op,op_strans> st() const; - arma_inline arma_warn_unused const Op,op_strans> as_col() const; + arma_warn_unused arma_inline const Op,op_strans> as_col() const; inline eT at_alt (const uword i) const; @@ -570,8 +570,8 @@ class subview_row : public subview inline subview_row tail(const uword N); inline const subview_row tail(const uword N) const; - inline arma_warn_unused uword index_min() const; - inline arma_warn_unused uword index_max() const; + arma_warn_unused inline uword index_min() const; + arma_warn_unused inline uword index_max() const; inline typename subview::row_iterator begin(); inline typename subview::const_row_iterator begin() const; diff --git a/include/armadillo_bits/subview_cube_bones.hpp b/include/armadillo_bits/subview_cube_bones.hpp index 11d4a72e..265fde9d 100644 --- a/include/armadillo_bits/subview_cube_bones.hpp +++ b/include/armadillo_bits/subview_cube_bones.hpp @@ -120,11 +120,11 @@ class subview_cube : public BaseCube< eT, subview_cube > inline void randu(); inline void randn(); - inline arma_warn_unused bool is_finite() const; - inline arma_warn_unused bool is_zero(const pod_type tol = 0) const; + arma_warn_unused inline bool is_finite() const; + arma_warn_unused inline bool is_zero(const pod_type tol = 0) const; - inline arma_warn_unused bool has_inf() const; - inline arma_warn_unused bool has_nan() const; + arma_warn_unused inline bool has_inf() const; + arma_warn_unused inline bool has_nan() const; inline eT at_alt (const uword i) const; @@ -159,15 +159,15 @@ class subview_cube : public BaseCube< eT, subview_cube > inline iterator(const iterator& X); inline iterator(subview_cube& in_sv, const uword in_row, const uword in_col, const uword in_slice); - inline arma_warn_unused eT& operator*(); + arma_warn_unused inline eT& operator*(); - inline iterator& operator++(); - inline arma_warn_unused iterator operator++(int); + inline iterator& operator++(); + arma_warn_unused inline iterator operator++(int); - inline arma_warn_unused bool operator==(const iterator& rhs) const; - inline arma_warn_unused bool operator!=(const iterator& rhs) const; - inline arma_warn_unused bool operator==(const const_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_iterator& rhs) const; + arma_warn_unused inline bool operator==(const iterator& rhs) const; + arma_warn_unused inline bool operator!=(const iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_iterator& rhs) const; typedef std::forward_iterator_tag iterator_category; typedef eT value_type; @@ -198,15 +198,15 @@ class subview_cube : public BaseCube< eT, subview_cube > inline const_iterator(const const_iterator& X); inline const_iterator(const subview_cube& in_sv, const uword in_row, const uword in_col, const uword in_slice); - inline arma_warn_unused const eT& operator*(); + arma_warn_unused inline const eT& operator*(); - inline const_iterator& operator++(); - inline arma_warn_unused const_iterator operator++(int); + inline const_iterator& operator++(); + arma_warn_unused inline const_iterator operator++(int); - inline arma_warn_unused bool operator==(const iterator& rhs) const; - inline arma_warn_unused bool operator!=(const iterator& rhs) const; - inline arma_warn_unused bool operator==(const const_iterator& rhs) const; - inline arma_warn_unused bool operator!=(const const_iterator& rhs) const; + arma_warn_unused inline bool operator==(const iterator& rhs) const; + arma_warn_unused inline bool operator!=(const iterator& rhs) const; + arma_warn_unused inline bool operator==(const const_iterator& rhs) const; + arma_warn_unused inline bool operator!=(const const_iterator& rhs) const; // So that we satisfy the STL iterator types. typedef std::forward_iterator_tag iterator_category; diff --git a/include/armadillo_bits/subview_cube_each_meat.hpp b/include/armadillo_bits/subview_cube_each_meat.hpp index a518444f..a3069182 100644 --- a/include/armadillo_bits/subview_cube_each_meat.hpp +++ b/include/armadillo_bits/subview_cube_each_meat.hpp @@ -53,7 +53,6 @@ subview_cube_each_common::check_size(const Mat& A) const template template -arma_cold inline const std::string subview_cube_each_common::incompat_size_string(const Mat& A) const diff --git a/include/armadillo_bits/subview_cube_meat.hpp b/include/armadillo_bits/subview_cube_meat.hpp index de6544b3..ca7b91cf 100644 --- a/include/armadillo_bits/subview_cube_meat.hpp +++ b/include/armadillo_bits/subview_cube_meat.hpp @@ -1341,7 +1341,6 @@ subview_cube::randn() template inline -arma_warn_unused bool subview_cube::is_finite() const { @@ -1366,7 +1365,6 @@ subview_cube::is_finite() const template inline -arma_warn_unused bool subview_cube::is_zero(const typename get_pod_type::result tol) const { @@ -1391,7 +1389,6 @@ subview_cube::is_zero(const typename get_pod_type::result tol) const template inline -arma_warn_unused bool subview_cube::has_inf() const { @@ -1416,7 +1413,6 @@ subview_cube::has_inf() const template inline -arma_warn_unused bool subview_cube::has_nan() const { @@ -2426,7 +2422,6 @@ subview_cube::iterator::iterator(subview_cube& in_sv, const uword in_row template inline -arma_warn_unused eT& subview_cube::iterator::operator*() { @@ -2467,7 +2462,6 @@ subview_cube::iterator::operator++() template inline -arma_warn_unused typename subview_cube::iterator subview_cube::iterator::operator++(int) { @@ -2482,7 +2476,6 @@ subview_cube::iterator::operator++(int) template inline -arma_warn_unused bool subview_cube::iterator::operator==(const iterator& rhs) const { @@ -2493,7 +2486,6 @@ subview_cube::iterator::operator==(const iterator& rhs) const template inline -arma_warn_unused bool subview_cube::iterator::operator!=(const iterator& rhs) const { @@ -2504,7 +2496,6 @@ subview_cube::iterator::operator!=(const iterator& rhs) const template inline -arma_warn_unused bool subview_cube::iterator::operator==(const const_iterator& rhs) const { @@ -2515,7 +2506,6 @@ subview_cube::iterator::operator==(const const_iterator& rhs) const template inline -arma_warn_unused bool subview_cube::iterator::operator!=(const const_iterator& rhs) const { @@ -2605,7 +2595,6 @@ subview_cube::const_iterator::const_iterator(const subview_cube& in_sv, template inline -arma_warn_unused const eT& subview_cube::const_iterator::operator*() { @@ -2646,7 +2635,6 @@ subview_cube::const_iterator::operator++() template inline -arma_warn_unused typename subview_cube::const_iterator subview_cube::const_iterator::operator++(int) { @@ -2661,7 +2649,6 @@ subview_cube::const_iterator::operator++(int) template inline -arma_warn_unused bool subview_cube::const_iterator::operator==(const iterator& rhs) const { @@ -2672,7 +2659,6 @@ subview_cube::const_iterator::operator==(const iterator& rhs) const template inline -arma_warn_unused bool subview_cube::const_iterator::operator!=(const iterator& rhs) const { @@ -2683,7 +2669,6 @@ subview_cube::const_iterator::operator!=(const iterator& rhs) const template inline -arma_warn_unused bool subview_cube::const_iterator::operator==(const const_iterator& rhs) const { @@ -2694,7 +2679,6 @@ subview_cube::const_iterator::operator==(const const_iterator& rhs) const template inline -arma_warn_unused bool subview_cube::const_iterator::operator!=(const const_iterator& rhs) const { diff --git a/include/armadillo_bits/subview_each_meat.hpp b/include/armadillo_bits/subview_each_meat.hpp index e48064f4..12d263ef 100644 --- a/include/armadillo_bits/subview_each_meat.hpp +++ b/include/armadillo_bits/subview_each_meat.hpp @@ -93,7 +93,6 @@ subview_each_common::check_size(const Mat& A) const template template -arma_cold inline const std::string subview_each_common::incompat_size_string(const Mat& A) const diff --git a/include/armadillo_bits/subview_meat.hpp b/include/armadillo_bits/subview_meat.hpp index 84387ca0..dea6c981 100644 --- a/include/armadillo_bits/subview_meat.hpp +++ b/include/armadillo_bits/subview_meat.hpp @@ -1234,7 +1234,6 @@ subview::randn() template inline -arma_warn_unused eT subview::at_alt(const uword ii) const { @@ -1245,7 +1244,6 @@ subview::at_alt(const uword ii) const template inline -arma_warn_unused eT& subview::operator[](const uword ii) { @@ -1261,7 +1259,6 @@ subview::operator[](const uword ii) template inline -arma_warn_unused eT subview::operator[](const uword ii) const { @@ -1277,7 +1274,6 @@ subview::operator[](const uword ii) const template inline -arma_warn_unused eT& subview::operator()(const uword ii) { @@ -1295,7 +1291,6 @@ subview::operator()(const uword ii) template inline -arma_warn_unused eT subview::operator()(const uword ii) const { @@ -1313,7 +1308,6 @@ subview::operator()(const uword ii) const template inline -arma_warn_unused eT& subview::operator()(const uword in_row, const uword in_col) { @@ -1328,7 +1322,6 @@ subview::operator()(const uword in_row, const uword in_col) template inline -arma_warn_unused eT subview::operator()(const uword in_row, const uword in_col) const { @@ -1343,7 +1336,6 @@ subview::operator()(const uword in_row, const uword in_col) const template inline -arma_warn_unused eT& subview::at(const uword in_row, const uword in_col) { @@ -1356,7 +1348,6 @@ subview::at(const uword in_row, const uword in_col) template inline -arma_warn_unused eT subview::at(const uword in_row, const uword in_col) const { @@ -1369,7 +1360,6 @@ subview::at(const uword in_row, const uword in_col) const template inline -arma_warn_unused eT& subview::front() { @@ -1382,7 +1372,6 @@ subview::front() template inline -arma_warn_unused eT subview::front() const { @@ -1395,7 +1384,6 @@ subview::front() const template inline -arma_warn_unused eT& subview::back() { @@ -1411,7 +1399,6 @@ subview::back() template inline -arma_warn_unused eT subview::back() const { @@ -1483,7 +1470,6 @@ subview::check_overlap(const subview& x) const template inline -arma_warn_unused bool subview::is_vec() const { @@ -1494,7 +1480,6 @@ subview::is_vec() const template inline -arma_warn_unused bool subview::is_finite() const { @@ -1515,7 +1500,6 @@ subview::is_finite() const template inline -arma_warn_unused bool subview::is_zero(const typename get_pod_type::result tol) const { @@ -1536,7 +1520,6 @@ subview::is_zero(const typename get_pod_type::result tol) const template inline -arma_warn_unused bool subview::has_inf() const { @@ -1557,7 +1540,6 @@ subview::has_inf() const template inline -arma_warn_unused bool subview::has_nan() const { @@ -2720,7 +2702,6 @@ subview::iterator::iterator(subview& in_sv, const uword in_row, const uw template inline -arma_warn_unused eT& subview::iterator::operator*() { @@ -2755,7 +2736,6 @@ subview::iterator::operator++() template inline -arma_warn_unused typename subview::iterator subview::iterator::operator++(int) { @@ -2770,7 +2750,6 @@ subview::iterator::operator++(int) template inline -arma_warn_unused bool subview::iterator::operator==(const iterator& rhs) const { @@ -2781,7 +2760,6 @@ subview::iterator::operator==(const iterator& rhs) const template inline -arma_warn_unused bool subview::iterator::operator!=(const iterator& rhs) const { @@ -2792,7 +2770,6 @@ subview::iterator::operator!=(const iterator& rhs) const template inline -arma_warn_unused bool subview::iterator::operator==(const const_iterator& rhs) const { @@ -2803,7 +2780,6 @@ subview::iterator::operator==(const const_iterator& rhs) const template inline -arma_warn_unused bool subview::iterator::operator!=(const const_iterator& rhs) const { @@ -2881,7 +2857,6 @@ subview::const_iterator::const_iterator(const subview& in_sv, const uwor template inline -arma_warn_unused const eT& subview::const_iterator::operator*() { @@ -2916,7 +2891,6 @@ subview::const_iterator::operator++() template inline -arma_warn_unused typename subview::const_iterator subview::const_iterator::operator++(int) { @@ -2931,7 +2905,6 @@ subview::const_iterator::operator++(int) template inline -arma_warn_unused bool subview::const_iterator::operator==(const iterator& rhs) const { @@ -2942,7 +2915,6 @@ subview::const_iterator::operator==(const iterator& rhs) const template inline -arma_warn_unused bool subview::const_iterator::operator!=(const iterator& rhs) const { @@ -2953,7 +2925,6 @@ subview::const_iterator::operator!=(const iterator& rhs) const template inline -arma_warn_unused bool subview::const_iterator::operator==(const const_iterator& rhs) const { @@ -2964,7 +2935,6 @@ subview::const_iterator::operator==(const const_iterator& rhs) const template inline -arma_warn_unused bool subview::const_iterator::operator!=(const const_iterator& rhs) const { @@ -3024,7 +2994,6 @@ subview::row_iterator::row_iterator(subview& in_sv, const uword in_row, template inline -arma_warn_unused eT& subview::row_iterator::operator*() { @@ -3053,7 +3022,6 @@ subview::row_iterator::operator++() template inline -arma_warn_unused typename subview::row_iterator subview::row_iterator::operator++(int) { @@ -3068,7 +3036,6 @@ subview::row_iterator::operator++(int) template inline -arma_warn_unused bool subview::row_iterator::operator==(const row_iterator& rhs) const { @@ -3079,7 +3046,6 @@ subview::row_iterator::operator==(const row_iterator& rhs) const template inline -arma_warn_unused bool subview::row_iterator::operator!=(const row_iterator& rhs) const { @@ -3090,7 +3056,6 @@ subview::row_iterator::operator!=(const row_iterator& rhs) const template inline -arma_warn_unused bool subview::row_iterator::operator==(const const_row_iterator& rhs) const { @@ -3101,7 +3066,6 @@ subview::row_iterator::operator==(const const_row_iterator& rhs) const template inline -arma_warn_unused bool subview::row_iterator::operator!=(const const_row_iterator& rhs) const { @@ -3175,7 +3139,6 @@ subview::const_row_iterator::const_row_iterator(const subview& in_sv, co template inline -arma_warn_unused const eT& subview::const_row_iterator::operator*() const { @@ -3204,7 +3167,6 @@ subview::const_row_iterator::operator++() template inline -arma_warn_unused typename subview::const_row_iterator subview::const_row_iterator::operator++(int) { @@ -3219,7 +3181,6 @@ subview::const_row_iterator::operator++(int) template inline -arma_warn_unused bool subview::const_row_iterator::operator==(const row_iterator& rhs) const { @@ -3230,7 +3191,6 @@ subview::const_row_iterator::operator==(const row_iterator& rhs) const template inline -arma_warn_unused bool subview::const_row_iterator::operator!=(const row_iterator& rhs) const { @@ -3241,7 +3201,6 @@ subview::const_row_iterator::operator!=(const row_iterator& rhs) const template inline -arma_warn_unused bool subview::const_row_iterator::operator==(const const_row_iterator& rhs) const { @@ -3252,7 +3211,6 @@ subview::const_row_iterator::operator==(const const_row_iterator& rhs) const template inline -arma_warn_unused bool subview::const_row_iterator::operator!=(const const_row_iterator& rhs) const { @@ -3413,7 +3371,6 @@ subview_col::operator= (const Gen& in) template arma_inline -arma_warn_unused const Op,op_htrans> subview_col::t() const { @@ -3424,7 +3381,6 @@ subview_col::t() const template arma_inline -arma_warn_unused const Op,op_htrans> subview_col::ht() const { @@ -3435,7 +3391,6 @@ subview_col::ht() const template arma_inline -arma_warn_unused const Op,op_strans> subview_col::st() const { @@ -3446,7 +3401,6 @@ subview_col::st() const template arma_inline -arma_warn_unused const Op,op_strans> subview_col::as_row() const { @@ -3780,7 +3734,6 @@ subview_col::tail(const uword N) const template inline -arma_warn_unused eT subview_col::min() const { @@ -3800,7 +3753,6 @@ subview_col::min() const template inline -arma_warn_unused eT subview_col::max() const { @@ -3866,7 +3818,6 @@ subview_col::max(uword& index_of_max_val) const template inline -arma_warn_unused uword subview_col::index_min() const { @@ -3890,7 +3841,6 @@ subview_col::index_min() const template inline -arma_warn_unused uword subview_col::index_max() const { @@ -4048,7 +3998,6 @@ subview_cols::operator= (const Gen& in) template arma_inline -arma_warn_unused const Op,op_htrans> subview_cols::t() const { @@ -4059,7 +4008,6 @@ subview_cols::t() const template arma_inline -arma_warn_unused const Op,op_htrans> subview_cols::ht() const { @@ -4070,7 +4018,6 @@ subview_cols::ht() const template arma_inline -arma_warn_unused const Op,op_strans> subview_cols::st() const { @@ -4081,7 +4028,6 @@ subview_cols::st() const template arma_inline -arma_warn_unused const Op,op_vectorise_col> subview_cols::as_col() const { @@ -4092,7 +4038,6 @@ subview_cols::as_col() const template inline -arma_warn_unused eT subview_cols::at_alt(const uword ii) const { @@ -4103,7 +4048,6 @@ subview_cols::at_alt(const uword ii) const template inline -arma_warn_unused eT& subview_cols::operator[](const uword ii) { @@ -4116,7 +4060,6 @@ subview_cols::operator[](const uword ii) template inline -arma_warn_unused eT subview_cols::operator[](const uword ii) const { @@ -4129,7 +4072,6 @@ subview_cols::operator[](const uword ii) const template inline -arma_warn_unused eT& subview_cols::operator()(const uword ii) { @@ -4144,7 +4086,6 @@ subview_cols::operator()(const uword ii) template inline -arma_warn_unused eT subview_cols::operator()(const uword ii) const { @@ -4159,7 +4100,6 @@ subview_cols::operator()(const uword ii) const template inline -arma_warn_unused eT& subview_cols::operator()(const uword in_row, const uword in_col) { @@ -4174,7 +4114,6 @@ subview_cols::operator()(const uword in_row, const uword in_col) template inline -arma_warn_unused eT subview_cols::operator()(const uword in_row, const uword in_col) const { @@ -4189,7 +4128,6 @@ subview_cols::operator()(const uword in_row, const uword in_col) const template inline -arma_warn_unused eT& subview_cols::at(const uword in_row, const uword in_col) { @@ -4202,7 +4140,6 @@ subview_cols::at(const uword in_row, const uword in_col) template inline -arma_warn_unused eT subview_cols::at(const uword in_row, const uword in_col) const { @@ -4380,7 +4317,6 @@ subview_row::operator= (const Gen& in) template arma_inline -arma_warn_unused const Op,op_htrans> subview_row::t() const { @@ -4391,7 +4327,6 @@ subview_row::t() const template arma_inline -arma_warn_unused const Op,op_htrans> subview_row::ht() const { @@ -4402,7 +4337,6 @@ subview_row::ht() const template arma_inline -arma_warn_unused const Op,op_strans> subview_row::st() const { @@ -4413,7 +4347,6 @@ subview_row::st() const template arma_inline -arma_warn_unused const Op,op_strans> subview_row::as_col() const { @@ -4708,7 +4641,6 @@ subview_row::tail(const uword N) const template inline -arma_warn_unused uword subview_row::index_min() const { @@ -4732,7 +4664,6 @@ subview_row::index_min() const template inline -arma_warn_unused uword subview_row::index_max() const { diff --git a/include/armadillo_bits/wall_clock_bones.hpp b/include/armadillo_bits/wall_clock_bones.hpp index 40542526..29c30142 100644 --- a/include/armadillo_bits/wall_clock_bones.hpp +++ b/include/armadillo_bits/wall_clock_bones.hpp @@ -28,8 +28,8 @@ class wall_clock inline wall_clock(); inline ~wall_clock(); - inline void tic(); //!< start the timer - inline arma_warn_unused double toc(); //!< return the number of seconds since the last call to tic() + inline void tic(); //!< start the timer + arma_warn_unused inline double toc(); //!< return the number of seconds since the last call to tic() private: