diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-04-21 20:30:41 -0600 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-04-23 11:56:26 -0700 |
| commit | dea352cc6cde131072e20e65d287a99ce949a3ce (patch) | |
| tree | e52cf6ff472a9390386f753c0a3e523010a2c220 | |
| parent | 700dc6972245735e183d62f35f5dcc42960ff7e7 (diff) | |
| download | numpy-dea352cc6cde131072e20e65d287a99ce949a3ce.tar.gz | |
BUG: ticket #1805, replace type char by signed char for tables.
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 8 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.h | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 5fecab5ac..bd12f58a0 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -3355,21 +3355,21 @@ NPY_NO_EXPORT PyTypeObject Py@NAME@ArrType_Type = { * type numbers. Note that signed integers are mapped to INTNEG_SCALAR, * which is different than what PyArray_ScalarKind returns. */ -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_scalar_kinds_table[NPY_NTYPES]; /* * This table maps a scalar kind (excluding NPY_NOSCALAR) * to the smallest type number of that kind. */ -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_smallest_type_of_kind_table[NPY_NSCALARKINDS]; /* * This table gives the type of the same kind, but next in the sequence * of sizes. */ -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_next_larger_type_table[NPY_NTYPES]; /* @@ -3383,7 +3383,7 @@ _npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES]; * This table gives the smallest-size and smallest-kind type to which * the input types may be safely cast, according to _npy_can_cast_safely. */ -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_type_promotion_table[NPY_NTYPES][NPY_NTYPES]; #endif diff --git a/numpy/core/src/multiarray/scalartypes.h b/numpy/core/src/multiarray/scalartypes.h index 53850947a..7397a97e0 100644 --- a/numpy/core/src/multiarray/scalartypes.h +++ b/numpy/core/src/multiarray/scalartypes.h @@ -5,24 +5,24 @@ #ifdef NPY_ENABLE_SEPARATE_COMPILATION extern NPY_NO_EXPORT unsigned char _npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES]; -extern NPY_NO_EXPORT char +extern NPY_NO_EXPORT signed char _npy_scalar_kinds_table[NPY_NTYPES]; -extern NPY_NO_EXPORT char +extern NPY_NO_EXPORT signed char _npy_type_promotion_table[NPY_NTYPES][NPY_NTYPES]; -extern NPY_NO_EXPORT char +extern NPY_NO_EXPORT signed char _npy_smallest_type_of_kind_table[NPY_NSCALARKINDS]; -extern NPY_NO_EXPORT char +extern NPY_NO_EXPORT signed char _npy_next_larger_type_table[NPY_NTYPES]; #else NPY_NO_EXPORT unsigned char _npy_can_cast_safely_table[NPY_NTYPES][NPY_NTYPES]; -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_scalar_kinds_table[NPY_NTYPES]; -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_type_promotion_table[NPY_NTYPES][NPY_NTYPES]; -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_smallest_type_of_kind_table[NPY_NSCALARKINDS]; -NPY_NO_EXPORT char +NPY_NO_EXPORT signed char _npy_next_larger_type_table[NPY_NTYPES]; #endif |