phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce pedantic compiler warnings

Browse Source
This commit is contained in:
conrad
2021-05-21 15:21:38 +10:00
parent b021217b28
commit 7706301d3e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_as_scalar.hpp
+2 -2
View File
@@ -301,9 +301,9 @@ as_scalar(const Glue<T1, T2, glue_times>& X, const typename arma_not_cx<typename
if(is_glue_times_diag<T1>::value == false)
{
const sword N_mat = 1 + depth_lhs< glue_times, Glue<T1,T2,glue_times> >::num;
constexpr uword N_mat = 1 + depth_lhs< glue_times, Glue<T1,T2,glue_times> >::num;
arma_extra_debug_print(arma_str::format("N_mat = %d") % N_mat);
arma_extra_debug_print(arma_str::format("N_mat = %u") % N_mat);
return as_scalar_redirect<N_mat>::apply(X);
}
include/armadillo_bits/glue_times_meat.hpp
+2 -2
View File
@@ -521,9 +521,9 @@ glue_times::apply(Mat<typename T1::elem_type>& out, const Glue<T1,T2,glue_times>
{
arma_extra_debug_sigprint();
const sword N_mat = 1 + depth_lhs< glue_times, Glue<T1,T2,glue_times> >::num;
constexpr uword N_mat = 1 + depth_lhs< glue_times, Glue<T1,T2,glue_times> >::num;
arma_extra_debug_print(arma_str::format("N_mat = %d") % N_mat);
arma_extra_debug_print(arma_str::format("N_mat = %u") % N_mat);
glue_times_redirect<N_mat>::apply(out, X);
}