*** liboctave/chNDArray.cc.orig2 2004-07-30 10:02:29.000000000 +0200 --- liboctave/chNDArray.cc 2004-08-24 16:48:42.000000000 +0200 *************** *** 53,59 **** concat (const charNDArray& ra, const charNDArray& rb, const Array& ra_idx) { charNDArray retval (ra); ! if (ra.numel () > 0) retval.insert (rb, ra_idx); return retval; } --- 53,59 ---- concat (const charNDArray& ra, const charNDArray& rb, const Array& ra_idx) { charNDArray retval (ra); ! if (rb.numel () > 0) retval.insert (rb, ra_idx); return retval; } *************** *** 65,71 **** charNDArray tmp (rb.dims ()); int nel = rb.numel (); ! if (ra.numel () == 0) return retval; for (int i = 0; i < nel; i++) --- 65,71 ---- charNDArray tmp (rb.dims ()); int nel = rb.numel (); ! if (rb.numel () == 0) return retval; for (int i = 0; i < nel; i++) *************** *** 124,129 **** --- 124,132 ---- } } + if (rb.numel () == 0) + return retval; + retval.insert (rb, ra_idx); return retval; } *** liboctave/CNDArray.cc.orig2 2004-07-30 10:02:29.000000000 +0200 --- liboctave/CNDArray.cc 2004-08-24 16:47:22.000000000 +0200 *************** *** 658,664 **** const Array& ra_idx) { ComplexNDArray retval (ra); ! if (ra.numel () > 0) retval.insert (rb, ra_idx); return retval; } --- 658,664 ---- const Array& ra_idx) { ComplexNDArray retval (ra); ! if (rb.numel () > 0) retval.insert (rb, ra_idx); return retval; } *************** *** 668,674 **** { ComplexNDArray retval (ra); ComplexNDArray tmp (rb); ! if (ra.numel () > 0) retval.insert (tmp, ra_idx); return retval; } --- 668,674 ---- { ComplexNDArray retval (ra); ComplexNDArray tmp (rb); ! if (rb.numel () > 0) retval.insert (tmp, ra_idx); return retval; } *************** *** 677,683 **** concat (const NDArray& ra, const ComplexNDArray& rb, const Array& ra_idx) { ComplexNDArray retval (ra); ! if (ra.numel () > 0) retval.insert (rb, ra_idx); return retval; } --- 677,683 ---- concat (const NDArray& ra, const ComplexNDArray& rb, const Array& ra_idx) { ComplexNDArray retval (ra); ! if (rb.numel () > 0) retval.insert (rb, ra_idx); return retval; } *** liboctave/dNDArray.cc.orig2 2004-07-30 10:02:29.000000000 +0200 --- liboctave/dNDArray.cc 2004-08-24 16:46:43.000000000 +0200 *************** *** 796,802 **** concat (const NDArray& ra, const NDArray& rb, const Array& ra_idx) { NDArray retval (ra); ! if (ra.numel () > 0) retval.insert (rb, ra_idx); return retval; } --- 796,802 ---- concat (const NDArray& ra, const NDArray& rb, const Array& ra_idx) { NDArray retval (ra); ! if (rb.numel () > 0) retval.insert (rb, ra_idx); return retval; }