Mercurial > octave-nkf
changeset 18277:cc1c19863ae3 stable
jit-typeinfo.cc: Fix C++ function ambiguity (bug #41145).
jit-typeinfo.cc (jit_operation::to_idx): Fix C++ function ambiguity over which
version of std::max() to call (bug #41145).
| author | Lasse Schuirmann <lasse@schuirmann.net> |
|---|---|
| date | Wed, 08 Jan 2014 14:42:56 +0100 |
| parents | 508f67c72854 |
| children | 8d98ebeceab4 8671f39d1728 |
| files | libinterp/corefcn/jit-typeinfo.cc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/jit-typeinfo.cc Tue Jan 14 12:38:25 2014 -0800 +++ b/libinterp/corefcn/jit-typeinfo.cc Wed Jan 08 14:42:56 2014 +0100 @@ -872,7 +872,7 @@ jit_operation::to_idx (const std::vector<jit_type*>& types) const { octave_idx_type numel = types.size (); - numel = std::max (2, numel); + numel = std::max (numel, static_cast<octave_idx_type>(2)); Array<octave_idx_type> idx (dim_vector (1, numel)); for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ());