Skip to content
New issue

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

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

Already on GitHub? # to your account

changed macro STREQ to NCSTREQ to avoid name collusion with HDF4 library #967

Merged
merged 12 commits into from
Jun 20, 2018

Conversation

edhartnett
Copy link
Contributor

@edhartnett edhartnett commented May 12, 2018

Fixes #834.

Since the same macro is used in ncgen, I changed it there as well. This required regeneration of the built files in the ncgen directory with make makeparser. Since my version of flex/bison is more new than those used to generate the files last time, there are some changes in the generated files.

FYI:

ed@mikado:~/tmp/netcdf-c$ flex --version
flex 2.6.1
ed@mikado:~/tmp/netcdf-c$ bison --version
bison (GNU Bison) 3.0.4

(This PR also include Fixes #959 in order to pass my CI system.)

@edhartnett
Copy link
Contributor Author

@WardF this should not be merged until after PR #558. Merge that one first, then I will update this one. Thanks!

@DennisHeimbigner
Copy link
Collaborator

Ncgen should be relatively insensitive to flex+bison version as long
as no features are obsoleted..

@edhartnett
Copy link
Contributor Author

@DennisHeimbigner yes, I get that ncgen should not be dependent on the versions of the tools. I just wanted to point out the changes since a bunch of the autogenerated files do have changes that have nothing to do with the STREQ macro, but are just changes coming from new versions of the tools.

@WardF it still makes sense to merge PR #558 before this PR, since both are changing the same generated files. Once #558 is merged, I can update this PR, and regenerate the files, to ensure we have a correct and consistent set of generated code files.

@edhartnett
Copy link
Contributor Author

One test failed due to travis timeout.

@edhartnett
Copy link
Contributor Author

OK, this us up to date with latest merges and Dennis' latest work, and can be merged at any time.

@edhartnett
Copy link
Contributor Author

I will take this down and put it back up after some more important PRs get merged.

@edhartnett edhartnett closed this May 22, 2018
@edhartnett edhartnett reopened this Jun 8, 2018
@edhartnett edhartnett closed this Jun 8, 2018
@edhartnett edhartnett reopened this Jun 11, 2018
@WardF WardF merged commit c4bf958 into Unidata:master Jun 20, 2018
@edhartnett edhartnett deleted the ejh_streq branch June 20, 2018 20:14
@edhartnett
Copy link
Contributor Author

Thanks!

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants