You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.5 KiB

  1. https://hg.savannah.gnu.org/hgweb/octave/raw-rev/7ffd2a0791ef
  2. # HG changeset patch
  3. # User John W. Eaton <jwe@octave.org>
  4. # Date 1325958274 18000
  5. # Node ID 7ffd2a0791ef389474bb52228e9b046a3721ab3f
  6. # Parent 906eecd4bf43b0146c50019ee41acac2dc83c935
  7. fix name lookup problem with static nested class
  8. * oct-inttypes.h (octave_int_arith_base<T,false>::mul):
  9. Tag truncate_int with octave_int_base<T>::.
  10. (octave_int_arith_base<T,true>::mul): Likewise.
  11. diff --git a/liboctave/oct-inttypes.h b/liboctave/oct-inttypes.h
  12. --- a/liboctave/oct-inttypes.h
  13. +++ b/liboctave/oct-inttypes.h
  14. @@ -366,8 +366,8 @@
  15. {
  16. // Promotion type for multiplication (if exists).
  17. typedef typename query_integer_type<2*sizeof (T), false>::type mptype;
  18. - return truncate_int (static_cast<mptype> (x)
  19. - * static_cast<mptype> (y));
  20. + return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
  21. + * static_cast<mptype> (y));
  22. }
  23. // Division with rounding to nearest. Note that / and % are probably
  24. @@ -621,8 +621,8 @@
  25. {
  26. // Promotion type for multiplication (if exists).
  27. typedef typename query_integer_type<2*sizeof (T), true>::type mptype;
  28. - return truncate_int (static_cast<mptype> (x)
  29. - * static_cast<mptype> (y));
  30. + return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
  31. + * static_cast<mptype> (y));
  32. }
  33. // Division.