Skip to content

Commit

Permalink
Auto merge of #6009 - juliantaylor:pedantic, r=njsmith
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
homu committed Jun 23, 2015
2 parents e4ab830 + 592e404 commit 3d2b8ca
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions numpy/core/include/numpy/ndarraytypes.h
Expand Up @@ -156,7 +156,7 @@ typedef enum {


typedef enum {
NPY_INTROSELECT=0,
NPY_INTROSELECT=0
} NPY_SELECTKIND;
#define NPY_NSELECTS (NPY_INTROSELECT + 1)

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 3d2b8ca

Please sign in to comment.