diff options
| author | Homu <homu@barosl.com> | 2015-06-23 11:47:21 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2015-06-23 11:47:21 +0900 |
| commit | 3d2b8ca9bcbdbc9e835cb3f8d56c2d93a67b00aa (patch) | |
| tree | 10b56c1c8ae85377508e7a78a011ed04390a38b6 /numpy/core | |
| parent | e4ab83050f3f64554726b9c5fd794e5535ab77ff (diff) | |
| parent | 592e404b7406c0d3c9db568f737e9c96b3736f3a (diff) | |
| download | numpy-3d2b8ca9bcbdbc9e835cb3f8d56c2d93a67b00aa.tar.gz | |
Auto merge of #6009 - juliantaylor:pedantic, r=njsmith
MAINT: fix two Wpedantic warnings in public header
Wpedantic is to strict to be really useful generally, but our public headers at least should avoid easy to avoid warnings for projects that do use this flag.
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index c11e2505a..8403ee29f 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -156,7 +156,7 @@ typedef enum { typedef enum { - NPY_INTROSELECT=0, + NPY_INTROSELECT=0 } NPY_SELECTKIND; #define NPY_NSELECTS (NPY_INTROSELECT + 1) @@ -202,7 +202,7 @@ typedef enum { /* Allow safe casts or casts within the same kind */ NPY_SAME_KIND_CASTING=3, /* Allow any casts */ - NPY_UNSAFE_CASTING=4, + NPY_UNSAFE_CASTING=4 } NPY_CASTING; typedef enum { |