comparison libinterp/dldfcn/dmperm.cc @ 21211:2cf8bc5c7017

use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests * configure.ac (HAVE_HDF5_INT2FLOAT_CONVERSIONS): AC_DEFINE here. * ls-hdf5.cc (HAVE_HDF5_INT2FLOAT_CONVERSION): Delete definition. * ls-hdf5.cc, ls-hdf5.h, ccolamd.cc, dmperm.cc, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, pt-eval.cc: Use #if defined (HAVE_FOO) instead of #if HAVE_FOO.
author John W. Eaton <jwe@octave.org>
date Sat, 06 Feb 2016 08:48:47 -0500
parents fcac5dbbf9ed
children a83e7a384ee0
comparison
equal deleted inserted replaced
21210:4f7d3989c462 21211:2cf8bc5c7017
49 for (octave_idx_type i = 0; i < n; i++) 49 for (octave_idx_type i = 0; i < n; i++)
50 ret.xelem (i) = p[i] + 1; 50 ret.xelem (i) = p[i] + 1;
51 return ret; 51 return ret;
52 } 52 }
53 53
54 #if HAVE_CXSPARSE 54 #if defined (HAVE_CXSPARSE)
55 static octave_value_list 55 static octave_value_list
56 dmperm_internal (bool rank, const octave_value arg, int nargout) 56 dmperm_internal (bool rank, const octave_value arg, int nargout)
57 { 57 {
58 octave_value_list retval; 58 octave_value_list retval;
59 octave_idx_type nr = arg.rows (); 59 octave_idx_type nr = arg.rows ();
134 @cite{Computing the Block Triangular Form of a Sparse Matrix}.\n\ 134 @cite{Computing the Block Triangular Form of a Sparse Matrix}.\n\
135 ACM Trans. Math. Software, 16(4):303-324, 1990.\n\ 135 ACM Trans. Math. Software, 16(4):303-324, 1990.\n\
136 @seealso{colamd, ccolamd}\n\ 136 @seealso{colamd, ccolamd}\n\
137 @end deftypefn") 137 @end deftypefn")
138 { 138 {
139 #if HAVE_CXSPARSE 139 #if defined (HAVE_CXSPARSE)
140 140
141 if (args.length () != 1) 141 if (args.length () != 1)
142 print_usage (); 142 print_usage ();
143 143
144 return ovl (dmperm_internal (false, args(0), nargout)); 144 return ovl (dmperm_internal (false, args(0), nargout));
177 @code{sprank (@var{S}) >= rank (@var{S})}. Ignoring floating point errors\n\ 177 @code{sprank (@var{S}) >= rank (@var{S})}. Ignoring floating point errors\n\
178 @code{sprank (@var{S}) == rank (@var{S})}.\n\ 178 @code{sprank (@var{S}) == rank (@var{S})}.\n\
179 @seealso{dmperm}\n\ 179 @seealso{dmperm}\n\
180 @end deftypefn") 180 @end deftypefn")
181 { 181 {
182 #if HAVE_CXSPARSE 182 #if defined (HAVE_CXSPARSE)
183 183
184 if (args.length () != 1) 184 if (args.length () != 1)
185 print_usage (); 185 print_usage ();
186 186
187 return ovl (dmperm_internal (true, args(0), nargout)); 187 return ovl (dmperm_internal (true, args(0), nargout));