Mercurial > hg > octave-nkf
diff libinterp/interpfcn/utils.cc @ 15215:9020dddc925a
use std::numeric_limits for integer max and min values
* strfind.cc, gl-render.cc, jit-typeinfo.cc, oct-stream.cc,
sparse-xpow.cc, xpow.cc, debug.cc, file-io.cc, ls-oct-ascii.cc,
oct-hist.cc, pr-output.cc, utils.cc, variables.h, ov-base-int.cc,
ov-base.cc, ov-bool-sparse.cc, ov-cx-sparse.cc, ov-float.cc,
ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, Array.cc,
Sparse.cc, chNDArray.cc, dNDArray.cc, data-conv.cc, data-conv.h,
fNDArray.cc, kpse.cc, oct-inttypes.h, oct-time.cc:
Use std::numeric_limits for max and min integer values. Include
<limits>, not <climits>.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 22 Aug 2012 17:36:54 -0400 |
| parents | 2fc554ffbc28 |
| children | 13ffb3130b2f |
line wrap: on
line diff
--- a/libinterp/interpfcn/utils.cc +++ b/libinterp/interpfcn/utils.cc @@ -26,11 +26,11 @@ #endif #include <cerrno> -#include <climits> #include <cstring> #include <fstream> #include <iostream> +#include <limits> #include <string> #include <sys/types.h> @@ -1266,7 +1266,9 @@ = static_cast<unsigned int> (modf (seconds, &t) * 1000000); unsigned int sec - = (t > UINT_MAX) ? UINT_MAX : static_cast<unsigned int> (t); + = ((t > std::numeric_limits<unsigned int>::max ()) + ? std::numeric_limits<unsigned int>::max () + : static_cast<unsigned int> (t)); // Versions of these functions that accept unsigned int args are // defined in cutils.c.