-
Notifications
You must be signed in to change notification settings - Fork 164
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.
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
Fix conflicting definitions from io/dynamic_io_new.hpp and toolbox/dynamic_images.hpp #185
Fix conflicting definitions from io/dynamic_io_new.hpp and toolbox/dynamic_images.hpp #185
Conversation
…namic_images.hpp The problem appears to be due to the same definitions copied from one part of the library to the other. The definitions have been shuffled to fix the compilation, but purely based on searching the code for what is used where, thus without confidence where those belong by author's intention. Fixes boostorg#183
1b37b62
to
ece7150
Compare
@stefanseefeld this one is now ready to review. CI buils are still ongoing for the boostorg, but my personal one has finished green https://travis-ci.org/mloskot/gil/builds/466699298 |
Since the old version of |
Possibly, or even
That seems like an arguable direction. The |
@stefanseefeld Thanks for the review. @sdebionne Do you agree see any problems; have any objections against merging this PR? e.g. if you think it would seriously break things on your end of GIL usage. |
Nope, nothing serious, go ahead! Thanks for asking! |
Great, merging. ...and praying |
The problem appears to be due to the same definitions copied from one part of the library to the other.
The definitions have been shuffled to fix the compilation, but purely based on searching the code for what is used where, thus without confidence where those belong by author's intention.
Fixes #183
Tasklist
extension/toolbox/dynamic_images.hpp
- removedconstruct_matched
which is defined inio/dynamic_io_new.hpp
and it is not used anywhere inextension/toolbox/*.hpp
, but only inextension/io
.io/dynamic_io_new.hpp
- removedany_image_*_t
structures which are defined and used inextension/toolbox/dynamic_images.hpp
, but nowhere else.