Skip to content

Fix Clang -Wenum-conversion warnings #3204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seanm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Clang -Wenum-conversion warnings #3204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libdap2/dceconstraints.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ dcedump(DCEnode* node, NCbytes* buf)
case CES_SELECT: {
DCEselection* sel = (DCEselection*)node;
dcetobuffer((DCEnode*)sel->lhs,buf);
if(sel->operator == CES_NIL) break;
if(sel->operator == CEO_NIL) break;
ncbytescat(buf,opstrings[(int)sel->operator]);
if(nclistlength(sel->rhs) > 1)
ncbytescat(buf,"{");
Expand Down Expand Up @@ -1129,7 +1129,7 @@ dcedumpraw(DCEnode* node, NCbytes* buf)
DCEselection* sel = (DCEselection*)node;
ncbytescat(buf," ");
dcedumpraw((DCEnode*)sel->lhs,buf);
if(sel->operator == CES_NIL) break;
if(sel->operator == CEO_NIL) break;
ncbytescat(buf,opstrings[(int)sel->operator]);
if(nclistlength(sel->rhs) > 1)
ncbytescat(buf,"{");
Expand Down
2 changes: 1 addition & 1 deletion libdap2/dceconstraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ typedef struct DCEvalue {

typedef struct DCEselection {
DCEnode node;
CEsort operator;
CEops operator;
DCEvalue* lhs;
NClist* rhs;
} DCEselection;
Expand Down
4 changes: 2 additions & 2 deletions libdap2/dceparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ sel_clause(DCEparsestate* state, int selcase,
Object lhs, Object relop0, Object values)
{
DCEselection* sel = (DCEselection*)dcecreate(CES_SELECT);
sel->operator = (CEsort)relop0;
sel->operator = (CEops)relop0;
sel->lhs = (DCEvalue*)lhs;
if(selcase == 2) {/*singleton value*/
sel->rhs = nclistnew();
Expand Down Expand Up @@ -318,7 +318,7 @@ collectlist(Object list0, Object decl)
}

Object
makeselectiontag(CEsort tag)
makeselectiontag(CEops tag)
{
return (Object) tag;
}
Expand Down
2 changes: 1 addition & 1 deletion libdap2/dceparselex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extern Object function(DCEparsestate* state, Object fcnname, Object args);
extern Object arg_list(DCEparsestate* state, Object list0, Object decl);
extern Object value_list(DCEparsestate* state, Object list0, Object decl);
extern Object value(DCEparsestate* state, Object value);
extern Object makeselectiontag(CEsort);
extern Object makeselectiontag(CEops);
extern Object indexer(DCEparsestate* state, Object name, Object indices);
extern Object indexpath(DCEparsestate* state, Object list0, Object index);
extern Object var(DCEparsestate* state, Object indexpath);
Expand Down
Loading