diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2009-07-27 01:14:30 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2009-07-27 01:14:30 +0000 |
| commit | 6a1efaff6d76fe06667b4bf65eb24729543a3c82 (patch) | |
| tree | 576a4aaab8f8f0afb5de100184a7cf16428398bd /numpy | |
| parent | 717c7acf14d04be79d7a1c098d83cac69481e0af (diff) | |
| download | numpy-6a1efaff6d76fe06667b4bf65eb24729543a3c82.tar.gz | |
Finish fixing merge hassles.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/_sortmodule.c.src | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/numpy/core/src/_sortmodule.c.src b/numpy/core/src/_sortmodule.c.src index 288a0cc1a..8dab4dfce 100644 --- a/numpy/core/src/_sortmodule.c.src +++ b/numpy/core/src/_sortmodule.c.src @@ -114,7 +114,6 @@ PyObject_LT(PyObject *pa, PyObject *pb) return 0; } -#define copy_string memcpy NPY_INLINE static void STRING_COPY(char *s1, char *s2, size_t len) @@ -591,10 +590,6 @@ static void @TYPE@_COPY(pk, pj, len); pj += len; } - else { - @copy@(pk, pj, len); - pj += len; - } pk += len; } @TYPE@_COPY(pk, pj, pi - pj); |