comparison src/ov.cc @ 10350:12884915a8e4

merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents 8b3cfc1288e2
children cc69a17ec801
comparison
equal deleted inserted replaced
10349:d4d13389c957 10350:12884915a8e4
1488 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) 1488 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1))
1489 { 1489 {
1490 if (!force_vector_conversion) 1490 if (!force_vector_conversion)
1491 gripe_implicit_conversion ("Octave:array-as-vector", 1491 gripe_implicit_conversion ("Octave:array-as-vector",
1492 my_type.c_str (), wanted_type.c_str ()); 1492 my_type.c_str (), wanted_type.c_str ());
1493 retval = dim_vector (nel); 1493 retval = dim_vector (nel, 1);
1494 } 1494 }
1495 1495
1496 return retval; 1496 return retval;
1497 } 1497 }
1498 1498