diff --git a/include/armadillo_bits/op_sort_index_bones.hpp b/include/armadillo_bits/op_sort_index_bones.hpp index 8f2c7f73..693523f9 100644 --- a/include/armadillo_bits/op_sort_index_bones.hpp +++ b/include/armadillo_bits/op_sort_index_bones.hpp @@ -26,7 +26,7 @@ class op_sort_index { public: - template + template static inline bool apply_helper(Mat& out, const Proxy& P, const uword sort_mode); template diff --git a/include/armadillo_bits/op_sort_index_meat.hpp b/include/armadillo_bits/op_sort_index_meat.hpp index 9171878f..86c30bbc 100644 --- a/include/armadillo_bits/op_sort_index_meat.hpp +++ b/include/armadillo_bits/op_sort_index_meat.hpp @@ -21,7 +21,7 @@ -template +template inline bool op_sort_index::apply_helper(Mat& out, const Proxy& P, const uword sort_mode) @@ -76,27 +76,13 @@ op_sort_index::apply_helper(Mat& out, const Proxy& P, const uword sor { arma_sort_index_mangle_ascend_comparator comparator; - if(use_stable_sort) - { - std::stable_sort( packet_vec.begin(), packet_vec.end(), comparator ); - } - else - { - std::sort( packet_vec.begin(), packet_vec.end(), comparator ); - } + std::stable_sort( packet_vec.begin(), packet_vec.end(), comparator ); } else { arma_sort_index_mangle_descend_comparator comparator; - if(use_stable_sort) - { - std::stable_sort( packet_vec.begin(), packet_vec.end(), comparator ); - } - else - { - std::sort( packet_vec.begin(), packet_vec.end(), comparator ); - } + std::stable_sort( packet_vec.begin(), packet_vec.end(), comparator ); } uword* out_mem = out.memptr(); @@ -130,13 +116,13 @@ op_sort_index::apply(Mat& out, const mtOp& in) { Mat tmp; - all_non_nan = op_sort_index::apply_helper(tmp, P, sort_mode); + all_non_nan = op_sort_index::apply_helper(tmp, P, sort_mode); out.steal_mem(tmp); } else { - all_non_nan = op_sort_index::apply_helper(out, P, sort_mode); + all_non_nan = op_sort_index::apply_helper(out, P, sort_mode); } if(all_non_nan == false) { out.soft_reset(); } diff --git a/include/armadillo_bits/op_sort_meat.hpp b/include/armadillo_bits/op_sort_meat.hpp index 90cdf3ab..0305c67f 100644 --- a/include/armadillo_bits/op_sort_meat.hpp +++ b/include/armadillo_bits/op_sort_meat.hpp @@ -88,7 +88,7 @@ op_sort::apply_noalias(Mat& out, const Mat& X, const uword sort_mode, co const Proxy< Col > P(X_col); - const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); + const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); if(all_non_nan == false) { @@ -128,7 +128,7 @@ op_sort::apply_noalias(Mat& out, const Mat& X, const uword sort_mode, co const Proxy< Col > P(Y_col); - const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); + const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); if(all_non_nan == false) { @@ -260,7 +260,7 @@ op_sort_vec::apply(Mat& out, const Op& i const Proxy< Mat > P(X); - const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); + const bool all_non_nan = op_sort_index::apply_helper(indices, P, sort_mode); if(all_non_nan == false) {