diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-10-16 14:04:09 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-10-16 14:04:09 -0700 |
| commit | a6b0f40213e5f0418d3ecf37436c332478ebc039 (patch) | |
| tree | 4e2c2b068ea0fee9a9f74935713ac8512442b22e | |
| parent | 84c52d80b05510e10e730ce9c8c026aadb429594 (diff) | |
| parent | 0f99cf0476fed0a94656364454a69cfa86d0c890 (diff) | |
| download | numpy-a6b0f40213e5f0418d3ecf37436c332478ebc039.tar.gz | |
Merge pull request #3932 from juliantaylor/windows-annoyance
BUG: fix declaration-after-statement
| -rw-r--r-- | numpy/core/src/multiarray/lowlevel_strided_loops.c.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src index e9820a5e4..c22195c16 100644 --- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src +++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src @@ -198,6 +198,11 @@ static void npy_intp N, npy_intp NPY_UNUSED(src_itemsize), NpyAuxData *NPY_UNUSED(data)) { +# if @elsize@ != 16 + @type@ temp; +# else + npy_uint64 temp0, temp1; +#endif #if @is_aligned@ && @elsize@ != 16 /* sanity check */ assert(npy_is_aligned(dst, _ALIGN(@type@))); @@ -208,9 +213,8 @@ static void #else # if @elsize@ != 16 - @type@ temp = @swap@@elsize@(*((@type@ *)src)); + temp = @swap@@elsize@(*((@type@ *)src)); # else - npy_uint64 temp0, temp1; # if @is_swap@ == 0 temp0 = (*((npy_uint64 *)src)); temp1 = (*((npy_uint64 *)src + 1)); |