Fix include c2a-core v4 #519
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
sksat
added
bug
sksat
requested review from
suzuki-toshihir0,
t-hosonuma and
conjikidow
and removed request for
a team
sksat
commented
Oct 17, 2023
| @@ -9,7 +9,9 @@ | |||
| #ifdef USE_C2A | |||
| #include "src_core/c2a_core_main.h" | |||
|
|
|||
| #if C2A_CORE_VER_MAJOR == 4 | |||
| #if !defined(C2A_CORE_VER_MAJOR) | |||
There was a problem hiding this comment.
C2A_CORE_VER_MAJOR が常に定義されていればこれでよい（そしてそうあるべき）のだが，よく考えると C2A_CORE_VER_MAJOR は v3.5.0 で入れたものなので，この対応だと v3.0.0 ~ v3.4.0 に対して breaking となってしまう
There was a problem hiding this comment.
そしてこのファイル，もしかしてUSE_C2A=OFF でもビルドされてる？（なのでこの PR の CI 落ちてる）
There was a problem hiding this comment.
not defined な時は #warning に変えた: f639d33
There was a problem hiding this comment.
これらのファイルは USE_C2A=ON の時のみビルドすべきでは？というのは #520 でやる（breaking change になってしまうし）
sksat
force-pushed
the
hotfix/fix-include-c2a-core-v4
branch
from
5cc8176 to
f639d33
Compare
1 task
200km
added a commit
that referenced
this pull request
Oct 17, 2023
Merge develop to main for hotfix #519
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.
Related issues
Description
Fixes build issue with c2a-core v4 integration.
src/components/real/communication/wings_command_sender_to_c2a.cpp#include "src_core/c2a_core_main.h"C2A_CORE_VER_MAJORis definedTest results
Impact
Supplementary information
N/A