Filter conflicting global constants#1916
Filter conflicting global constants#1916ashtonmeuser wants to merge 2 commits intogodotengine:masterfrom
Conversation
|
@dsnopek, I noticed you added the waiting for Godot label to this PR. I'm curious to know what the order of operations is in a situation like this. godotengine/godot#115649 relies on this PR being merged to pass tests (see GHA failure). However, merging #1916 before #115649 is ultimately rejected wouldn't make sense either. Which should be merged first? Is Godot okay breaking the build temporarily while Godot C++ catches up? Ultimately, this seems like a symptom of the Godot proper test suite, particularly the Mono build, relying on Godot C++ bindings. |
|
If that one is approved and ready to be merged, but only waiting on this one, then I think we can merge it. The worry would be merging something so specific here, only for that PR to be rejected later Also, I think this PR will need to be cherry-picked to the godot-cpp |
Agreed. Just waiting on second approval from @AThousandShips. I'm happy to open a cherry pick once this has been merged if the procedure for that is simply another PR against the 4.5 branch. |
See godotengine/godot#115649.
In order to add integer limits to @globalscope constants, we'll need to ignore them in the generated godot-cpp/gen/include/godot_cpp/classes/global_constants.hpp. These constants conflict with macros defined in
cstdinte.g.UINT8_MAX(see cstdint docs).