Skip to content
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

[GDNative] fixed a bug with ambiguous include paths #10072

Merged

Conversation

karroffel
Copy link
Contributor

fixes #10071. The problem is that the json.h file includes the
local variant.h instead of the "absolute" core/variant.h

fixes godotengine#10071. The problem is that the json.h file includes the
local variant.h instead of the "absolute" core/variant.h
@karroffel
Copy link
Contributor Author

Note that this is a "local fix". The real fix would be to use absolute include paths everywhere in the codebase, but that's a massive undertaking and the files in modules/gdnative/godot/ are practically the only ones that are in danger of those errors (because they have the same names as core types).

@karroffel karroffel merged commit 211dfa6 into godotengine:master Aug 4, 2017
@@ -29,9 +29,10 @@
/*************************************************************************/
#include <godot/dictionary.h>

#include "core/variant.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would have been good to put a comment, so that we don't delete the separating line in the future, thus breaking it again next time clang-format changes the include order.

@karroffel karroffel deleted the gdnative-header-include-paths branch December 4, 2017 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compile error with MSVC
2 participants