"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/armadillo_bits/fn_sort.hpp" between
armadillo-10.2.0.tar.xz and armadillo-10.2.1.tar.xz

About: Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use.

fn_sort.hpp  (armadillo-10.2.0.tar.xz):fn_sort.hpp  (armadillo-10.2.1.tar.xz)
skipping to change at line 76 skipping to change at line 76
sort sort
( (
const T1& X, const T1& X,
const T2* sort_direction const T2* sort_direction
) )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0); const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0);
arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n"); arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n" );
const uword sort_type = (sig == 'a') ? 0 : 1; const uword sort_type = (sig == 'a') ? 0 : 1;
return Op<T1, op_sort_vec>(X, sort_type, 0); return Op<T1, op_sort_vec>(X, sort_type, 0);
} }
template<typename T1, typename T2> template<typename T1, typename T2>
arma_warn_unused arma_warn_unused
inline inline
typename typename
skipping to change at line 102 skipping to change at line 102
sort sort
( (
const T1& X, const T1& X,
const T2* sort_direction const T2* sort_direction
) )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0); const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0);
arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n"); arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n" );
const uword sort_type = (sig == 'a') ? 0 : 1; const uword sort_type = (sig == 'a') ? 0 : 1;
return Op<T1, op_sort>(X, sort_type, 0); return Op<T1, op_sort>(X, sort_type, 0);
} }
template<typename T1, typename T2> template<typename T1, typename T2>
arma_warn_unused arma_warn_unused
inline inline
typename typename
skipping to change at line 129 skipping to change at line 129
( (
const T1& X, const T1& X,
const T2* sort_direction, const T2* sort_direction,
const uword dim const uword dim
) )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0); const char sig = (sort_direction != nullptr) ? sort_direction[0] : char(0);
arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n"); arma_debug_check( (sig != 'a') && (sig != 'd'), "sort(): unknown sort directio n" );
const uword sort_type = (sig == 'a') ? 0 : 1; const uword sort_type = (sig == 'a') ? 0 : 1;
return Op<T1, op_sort>(X, sort_type, dim); return Op<T1, op_sort>(X, sort_type, dim);
} }
//! @} //! @}
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)