Merge rs_model.cpp into rs_model_impl.hpp #1082
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zoq
approved these changes
Aug 10, 2017
|
(Since I still have to support Windows Server 2000 as a target (don't laugh), I use the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should fix #1078 and #1076. @Muthiang, @rvx86: can you test this on your systems please? I have not been able to reproduce your problem, so I am not 100% sure if it will fix the issue you are each having.
What I've done here is just put the implementation that's currently in rs_model.cpp into rs_model_impl.hpp as inlined functions, because it seems like the compiler sometimes generates duplicate versions of template functions used in rs_model.cpp. Inlining the functions seems likely to fix this.
I also made a few fixes for some warnings, that is unrelated to the issue at hand but still nice to take care of. :)