# HG changeset patch # User Jaroslav Hajek # Date 1279865308 -7200 # Node ID 83896a06adaf2d6dfad7301d5c4cc387bd7bafcf # Parent 2c2d4a2f104716a536804b6ce11e72fc175809ce don't skip narrowing when concatenating complex matrices diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-23 Jaroslav Hajek + + * pt-mat.cc (do_single_type_concat_no_mutate): Remove. + (tree_matrix::rvalue1): Use do_single_type_concat instead. + 2010-07-21 Jaroslav Hajek * bitfcns.cc (Fsizemax): New DEFUN. diff --git a/src/pt-mat.cc b/src/pt-mat.cc --- a/src/pt-mat.cc +++ b/src/pt-mat.cc @@ -832,18 +832,6 @@ return result; } -template -static octave_value -do_single_type_concat_no_mutate (const dim_vector& dv, - tm_const& tmp) -{ - TYPE result; - - single_type_concat (result, dv, tmp); - - return new OV_TYPE (result); -} - octave_value tree_matrix::rvalue1 (int) { @@ -946,16 +934,14 @@ if (all_real_p) retval = do_single_type_concat (dv, tmp); else - retval = do_single_type_concat_no_mutate (dv, tmp); + retval = do_single_type_concat (dv, tmp); } else { if (all_real_p) retval = do_single_type_concat (dv, tmp); else - retval = do_single_type_concat_no_mutate (dv, tmp); + retval = do_single_type_concat (dv, tmp); } } else if (result_type == "single") @@ -963,8 +949,7 @@ if (all_real_p) retval = do_single_type_concat (dv, tmp); else - retval = do_single_type_concat_no_mutate (dv, tmp); + retval = do_single_type_concat (dv, tmp); } else if (result_type == "char") {