# HG changeset patch
# User David Bateman <dbateman@free.fr>
# Date 1222105025 14400
# Node ID 5d56d4fb6abd345b1c98d09475aa3425f6f1ba4f
# Parent  9e4a09b35cdbd3aa879ad1fa450feca01ea3c72e
Merge problem with previous patch to Fcat

diff -r 9e4a09b35cdb -r 5d56d4fb6abd src/data.cc
--- a/src/data.cc	Mon Sep 22 13:36:01 2008 -0400
+++ b/src/data.cc	Mon Sep 22 13:37:05 2008 -0400
@@ -1763,51 +1763,6 @@
     } \
  while (0)
 
-#define SINGLE_TYPE_CONCAT(TYPE, EXTRACTOR) \
-  do \
-    { \
-      int dv_len = dv.length (); \
-      Array<octave_idx_type> ra_idx (dv_len > 1 ? dv_len : 2, 0); \
-      \
-      for (int j = 1; j < n_args; j++) \
-	{ \
-	  OCTAVE_QUIT; \
-	  \
-	  TYPE ra = args(j).EXTRACTOR ();	\
-	  \
-	  if (! error_state) \
-	    { \
-	      result.insert (ra, ra_idx); \
-	      \
-	      if (error_state) \
-	        return retval; \
-	      \
-	      dim_vector dv_tmp = args (j).dims (); \
-	      \
-	      if (dim >= dv_len) \
-	        { \
-		  if (j > 1) \
-		    error ("%s: indexing error", fname.c_str ()); \
-		  break; \
-		} \
-	      else \
-		ra_idx (dim) += (dim < dv_tmp.length () ? dv_tmp (dim) : 1); \
-	    } \
-	} \
-    } \
- while (0)
-
-#define DO_SINGLE_TYPE_CONCAT(TYPE, EXTRACTOR) \
-  do \
-    { \
-      TYPE result (dv); \
-      \
-      SINGLE_TYPE_CONCAT(TYPE, EXTRACTOR); \
-      \
-      retval = result; \
-    } \
- while (0)
-
 static octave_value
 do_cat (const octave_value_list& args, std::string fname)
 {