Mercurial > hg > octave-lyh

comparison src/ov-null-mat.cc @ 8345:c777f3ce02d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
smarter conversion lookup
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 25 Nov 2008 14:04:55 +0100
parents 283989f2da9b
children 095ae5e0a831
comparison
equal deleted inserted replaced
8344:b5f10b123440 8345:c777f3ce02d8
38 CAST_CONV_ARG (const octave_null_matrix&); 38 CAST_CONV_ARG (const octave_null_matrix&);
39 39
40 return a.empty_clone (); 40 return a.empty_clone ();
41 } 41 }
42 42
43 octave_base_value::type_conv_fcn 43 octave_base_value::type_conv_info
44 octave_null_matrix::numeric_conversion_function (void) const 44 octave_null_matrix::numeric_conversion_function (void) const
45 { 45 {
46 return default_null_matrix_numeric_conversion_function; 46 return octave_base_value::type_conv_info (default_null_matrix_numeric_conversion_function,
47 octave_matrix::static_type_id ());
47 } 48 }
48 49
49 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_null_str, "null_string", "char"); 50 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_null_str, "null_string", "char");
50 51
51 const octave_value octave_null_str::instance (new octave_null_str ()); 52 const octave_value octave_null_str::instance (new octave_null_str ());
56 CAST_CONV_ARG (const octave_null_str&); 57 CAST_CONV_ARG (const octave_null_str&);
57 58
58 return a.empty_clone (); 59 return a.empty_clone ();
59 } 60 }
60 61
61 octave_base_value::type_conv_fcn 62 octave_base_value::type_conv_info
62 octave_null_str::numeric_conversion_function (void) const 63 octave_null_str::numeric_conversion_function (void) const
63 { 64 {
64 return default_null_str_numeric_conversion_function; 65 return octave_base_value::type_conv_info (default_null_str_numeric_conversion_function,
66 octave_char_matrix_str::static_type_id ());
65 } 67 }
66 68
67 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_null_sq_str, "null_sq_string", "char"); 69 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_null_sq_str, "null_sq_string", "char");
68 70
69 const octave_value octave_null_sq_str::instance (new octave_null_sq_str ()); 71 const octave_value octave_null_sq_str::instance (new octave_null_sq_str ());
74 CAST_CONV_ARG (const octave_null_sq_str&); 76 CAST_CONV_ARG (const octave_null_sq_str&);
75 77
76 return a.empty_clone (); 78 return a.empty_clone ();
77 } 79 }
78 80
79 octave_base_value::type_conv_fcn 81 octave_base_value::type_conv_info
80 octave_null_sq_str::numeric_conversion_function (void) const 82 octave_null_sq_str::numeric_conversion_function (void) const
81 { 83 {
82 return default_null_sq_str_numeric_conversion_function; 84 return octave_base_value::type_conv_info (default_null_sq_str_numeric_conversion_function,
85 octave_char_matrix_sq_str::static_type_id ());
83 } 86 }
84 87
85 DEFUN (isnull, args, , 88 DEFUN (isnull, args, ,
86 "-*- texinfo -*-\n\ 89 "-*- texinfo -*-\n\
87 @deftypefn {Built-in Function} {} isnull (@var{x})\n\ 90 @deftypefn {Built-in Function} {} isnull (@var{x})\n\