# HG changeset patch # User Rik # Date 1401732295 25200 # Node ID 332450e56698d8969d1cb7e193721e06c0288534 # Parent 99d63a2e221b705761d831c2f142de763c4291ce Fix compilation warning about use of '&' versus '&&' in find.cc. * find.cc (find_nonzero_elem_idx): Fix compilation warning about use of '&' versus '&&' in find.cc. diff -r 99d63a2e221b -r 332450e56698 libinterp/corefcn/find.cc --- a/libinterp/corefcn/find.cc Mon Jun 02 10:05:25 2014 -0700 +++ b/libinterp/corefcn/find.cc Mon Jun 02 11:04:55 2014 -0700 @@ -183,7 +183,7 @@ { // No items found. Fixup return dimensions for Matlab compatibility. // The behavior to match is documented in Array.cc (Array::find). - if ((nr == 0 && nc == 0) || nr == 1 & nc == 1) + if ((nr == 0 && nc == 0) || (nr == 1 && nc == 1)) { idx.resize (0, 0); @@ -294,12 +294,13 @@ } else { - // FIXME: Is this case even possible? A scalar permutation matrix seems to devolve - // to a scalar full matrix, at least from the Octave command line. Perhaps - // this function could be called internally from C++ with such a matrix. + // FIXME: Is this case even possible? A scalar permutation matrix seems + // to devolve to a scalar full matrix, at least from the Octave command + // line. Perhaps this function could be called internally from C++ with + // such a matrix. // No items found. Fixup return dimensions for Matlab compatibility. // The behavior to match is documented in Array.cc (Array::find). - if ((nr == 0 && nc == 0) || nr == 1 & nc == 1) + if ((nr == 0 && nc == 0) || (nr == 1 && nc == 1)) { idx.resize (0, 0);