comparison src/ov.cc @ 10405:cc69a17ec801

remove integer math warnings
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 09 Mar 2010 08:06:30 +0100
parents 12884915a8e4
children 4d1fc073fbb7
comparison
equal deleted inserted replaced
10404:b40a5fd3af41 10405:cc69a17ec801
1547 convert_to_int_array (const Array<octave_int<T> >& A) 1547 convert_to_int_array (const Array<octave_int<T> >& A)
1548 { 1548 {
1549 Array<int> retval (A.dims ()); 1549 Array<int> retval (A.dims ());
1550 octave_idx_type n = A.numel (); 1550 octave_idx_type n = A.numel ();
1551 1551
1552 octave_int<int>::clear_conv_flag ();
1553 for (octave_idx_type i = 0; i < n; i++) 1552 for (octave_idx_type i = 0; i < n; i++)
1554 retval.xelem (i) = octave_int<int> (A.xelem (i)); 1553 retval.xelem (i) = octave_int<int> (A.xelem (i));
1555
1556 if (octave_int<int>::get_trunc_flag ())
1557 gripe_truncated_conversion (octave_int<T>::type_name (), "int");
1558
1559 octave_int<int>::clear_conv_flag ();
1560 1554
1561 return retval; 1555 return retval;
1562 } 1556 }
1563 1557
1564 Array<int> 1558 Array<int>
1628 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A) 1622 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A)
1629 { 1623 {
1630 Array<octave_idx_type> retval (A.dims ()); 1624 Array<octave_idx_type> retval (A.dims ());
1631 octave_idx_type n = A.numel (); 1625 octave_idx_type n = A.numel ();
1632 1626
1633 octave_int<int>::clear_conv_flag ();
1634 for (octave_idx_type i = 0; i < n; i++) 1627 for (octave_idx_type i = 0; i < n; i++)
1635 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i)); 1628 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i));
1636
1637 if (octave_int<int>::get_trunc_flag ())
1638 gripe_truncated_conversion (octave_int<T>::type_name (), "int");
1639
1640 octave_int<int>::clear_conv_flag ();
1641 1629
1642 return retval; 1630 return retval;
1643 } 1631 }
1644 1632
1645 Array<octave_idx_type> 1633 Array<octave_idx_type>