octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

merge issue with previous Fcat patch


From: David Bateman
Subject: merge issue with previous Fcat patch
Date: Sat, 20 Sep 2008 00:27:17 +0200
User-agent: Thunderbird 2.0.0.16 (X11/20080725)

The attached changeset addresses a merge issue with my previous Fcat patch into John's tree. Minor patch and so no changelog entry.

D.
# HG changeset patch
# User David Bateman <address@hidden>
# Date 1221863135 -7200
# Node ID 8851c53e09a847e23baa18fd09800d58263570bb
# Parent  53c883b2b3de35f2aaa3a56780140c0d43f41296
Merge problem with previous patch to Fcat

diff --git a/src/data.cc b/src/data.cc
--- a/src/data.cc
+++ b/src/data.cc
@@ -1763,51 +1763,6 @@ return the product of the elements.\n\
     } \
  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)
 {

reply via email to

[Prev in Thread] Current Thread [Next in Thread]