Mercurial > jwe > octave

comparison liboctave/operators/Sparse-perm-op-defs.h @ 21129:228b65504557

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate useless statements after err_XXX. * Cell.cc, data.cc, eig.cc, hess.cc, oct-hist.cc, oct-stream.cc, rand.cc, audioread.cc, ov-base.cc, ov-class.cc, ov.cc, op-int.h, ops.h, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CRowVector.cc, DiagArray2.cc, MDiagArray2.cc, PermMatrix.cc, dMatrix.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCRowVector.cc, fMatrix.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h: maint: Eliminate useless statements after err_XXX.
author Rik <rik@octave.org>
date Thu, 21 Jan 2016 12:54:17 -0800
parents e39e05d90788
children 1473547f50f5
comparison
equal deleted inserted replaced
21128:61ca546e1942 21129:228b65504557
60 template <typename SM> 60 template <typename SM>
61 SM octinternal_do_mul_pm_sm (const PermMatrix& p, const SM& a) 61 SM octinternal_do_mul_pm_sm (const PermMatrix& p, const SM& a)
62 { 62 {
63 const octave_idx_type nr = a.rows (); 63 const octave_idx_type nr = a.rows ();
64 if (p.cols () != nr) 64 if (p.cols () != nr)
65 { 65 err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ());
66 err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ());
67 return SM ();
68 }
69 66
70 return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a); 67 return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a);
71 } 68 }
72 69
73 template <typename SM> 70 template <typename SM>
146 template <typename SM> 143 template <typename SM>
147 SM octinternal_do_mul_sm_pm (const SM& a, const PermMatrix& p) 144 SM octinternal_do_mul_sm_pm (const SM& a, const PermMatrix& p)
148 { 145 {
149 const octave_idx_type nc = a.cols (); 146 const octave_idx_type nc = a.cols ();
150 if (p.rows () != nc) 147 if (p.rows () != nc)
151 { 148 err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ());
152 err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ());
153 return SM ();
154 }
155 149
156 return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ()); 150 return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ());
157 } 151 }
158 152
159 #endif 153 #endif