Skip to content
Snippets Groups Projects
Commit 380ab432 authored by Amaury Johnen's avatar Amaury Johnen
Browse files

fix annoying warnings at compilation

parent b2608e8a
No related branches found
No related tags found
No related merge requests found
...@@ -1242,8 +1242,8 @@ namespace gmm { ...@@ -1242,8 +1242,8 @@ namespace gmm {
template <typename L1, typename L2> inline template <typename L1, typename L2> inline
void add_spec(const L1& l1, L2& l2, abstract_matrix) { void add_spec(const L1& l1, L2& l2, abstract_matrix) {
size_type m = mat_nrows(l1), n = mat_ncols(l1); GMM_ASSERT2(mat_nrows(l1)==mat_nrows(l2) &&
GMM_ASSERT2(m==mat_nrows(l2) && n==mat_ncols(l2), "dimensions mismatch"); mat_ncols(l1)==mat_ncols(l2), "dimensions mismatch");
add(l1, l2, typename linalg_traits<L1>::sub_orientation(), add(l1, l2, typename linalg_traits<L1>::sub_orientation(),
typename linalg_traits<L2>::sub_orientation()); typename linalg_traits<L2>::sub_orientation());
} }
...@@ -1933,9 +1933,11 @@ namespace gmm { ...@@ -1933,9 +1933,11 @@ namespace gmm {
template <typename L1, typename L2, typename L3> template <typename L1, typename L2, typename L3>
void mult_dispatch(const L1& l1, const L2& l2, L3& l3, abstract_matrix) { void mult_dispatch(const L1& l1, const L2& l2, L3& l3, abstract_matrix) {
typedef typename temporary_matrix<L3>::matrix_type temp_mat_type; typedef typename temporary_matrix<L3>::matrix_type temp_mat_type;
size_type m = mat_nrows(l1), n = mat_ncols(l1), k = mat_ncols(l2); size_type n = mat_ncols(l1);
if (n == 0) { gmm::clear(l3); return; } if (n == 0) { gmm::clear(l3); return; }
GMM_ASSERT2(n == mat_nrows(l2) && m == mat_nrows(l3) && k == mat_ncols(l3), GMM_ASSERT2(n == mat_nrows(l2) &&
mat_nrows(l1) == mat_nrows(l3) &&
mat_ncols(l2) == mat_ncols(l3),
"dimensions mismatch"); "dimensions mismatch");
if (same_origin(l2, l3) || same_origin(l1, l3)) { if (same_origin(l2, l3) || same_origin(l1, l3)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment