Mercurial > hg > octave-nkf
changeset 14168:7ffd2a0791ef stable
fix name lookup problem with static nested class
* oct-inttypes.h (octave_int_arith_base<T,false>::mul):
Tag truncate_int with octave_int_base<T>::.
(octave_int_arith_base<T,true>::mul): Likewise.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 07 Jan 2012 12:44:34 -0500 |
parents | 906eecd4bf43 |
children | c0ca47ab7641 |
files | liboctave/oct-inttypes.h |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/oct-inttypes.h +++ b/liboctave/oct-inttypes.h @@ -366,8 +366,8 @@ { // Promotion type for multiplication (if exists). typedef typename query_integer_type<2*sizeof (T), false>::type mptype; - return truncate_int (static_cast<mptype> (x) - * static_cast<mptype> (y)); + return octave_int_base<T>::truncate_int (static_cast<mptype> (x) + * static_cast<mptype> (y)); } // Division with rounding to nearest. Note that / and % are probably @@ -621,8 +621,8 @@ { // Promotion type for multiplication (if exists). typedef typename query_integer_type<2*sizeof (T), true>::type mptype; - return truncate_int (static_cast<mptype> (x) - * static_cast<mptype> (y)); + return octave_int_base<T>::truncate_int (static_cast<mptype> (x) + * static_cast<mptype> (y)); } // Division.