comparison src/ov-intx.h @ 7999:f7f2d867c523

style fixes
author John W. Eaton <jwe@octave.org>
date Wed, 30 Jul 2008 16:36:58 -0400
parents 2b8952e133c9
children cd90e2842080
comparison
equal deleted inserted replaced
7998:a4acda9fc3e7 7999:f7f2d867c523
67 67
68 bool is_integer_type (void) const { return true; } 68 bool is_integer_type (void) const { return true; }
69 69
70 private: 70 private:
71 71
72 template <class _int_matrix> 72 template <class IM>
73 _int_matrix convert_gripe () const 73 IM convert_gripe () const
74 { 74 {
75 typedef typename _int_matrix::element_type dest_el_type; 75 typedef typename IM::element_type dest_el_type;
76 typedef OCTAVE_INT_NDARRAY_T::element_type src_el_type; 76 typedef OCTAVE_INT_NDARRAY_T::element_type src_el_type;
77 dest_el_type::clear_trunc_flag (); 77 dest_el_type::clear_trunc_flag ();
78 _int_matrix retval (matrix); 78 IM retval (matrix);
79 if (dest_el_type::get_trunc_flag ()) 79 if (dest_el_type::get_trunc_flag ())
80 { 80 {
81 gripe_truncated_conversion (src_el_type::type_name (), 81 gripe_truncated_conversion (src_el_type::type_name (),
82 dest_el_type::type_name ()); 82 dest_el_type::type_name ());
83 dest_el_type::clear_trunc_flag (); 83 dest_el_type::clear_trunc_flag ();
84
85 } 84 }
86 85
87 return retval; 86 return retval;
88 } 87 }
89 88
427 426
428 bool is_integer_type (void) const { return true; } 427 bool is_integer_type (void) const { return true; }
429 428
430 private: 429 private:
431 430
432 template <class _int_scalar> 431 template <class IS>
433 _int_scalar convert_gripe () const 432 IS convert_gripe () const
434 { 433 {
435 typedef _int_scalar dest_el_type; 434 typedef IS dest_el_type;
436 typedef OCTAVE_INT_T src_el_type; 435 typedef OCTAVE_INT_T src_el_type;
437 dest_el_type::clear_trunc_flag (); 436 dest_el_type::clear_trunc_flag ();
438 _int_scalar retval (scalar); 437 IS retval (scalar);
439 if (dest_el_type::get_trunc_flag ()) 438 if (dest_el_type::get_trunc_flag ())
440 { 439 {
441 gripe_truncated_conversion (src_el_type::type_name (), 440 gripe_truncated_conversion (src_el_type::type_name (),
442 dest_el_type::type_name ()); 441 dest_el_type::type_name ());
443 dest_el_type::clear_trunc_flag (); 442 dest_el_type::clear_trunc_flag ();