fix compilation for clang #785
Closed
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
This was
linked to
issues
May 5, 2021
Xottab-DUTY
requested changes
May 5, 2021
There was a problem hiding this comment.
There were multiple attempts to fix that before. (see linked pull requests to issue #289)
3 of 5 pull requests were removing problem_solver_inline.h include from problem_solver.h and reincluding it into files in xrGame. It is wrong way to fix the issue.
Correct way to fix the issue is to move xrAICore dependencies from xrGame to xrAICore.
| @@ -149,4 +149,3 @@ class CProblemSolver | |||
| virtual void clear(); | |||
| }; | |||
|
|
|||
| #include "xrAICore/Components/problem_solver_inline.h" | |||
There was a problem hiding this comment.
This is not going to be allowed in any way.
| @@ -403,7 +403,7 @@ void InventoryUtilities::UpdateWeight(CUIStatic& wnd, CInventoryOwner* pInvOwner | |||
| string32 prefix; | |||
|
|
|||
| if (withPrefix) | |||
| xr_sprintf(prefix, "%%c[default]%s ", StringTable().translate("ui_inv_weight")); | |||
| xr_sprintf(prefix, "%%c[default]%s ", StringTable().translate("ui_inv_weight").c_str()); | |||
There was a problem hiding this comment.
It is better to move it into another pull request, so we can merge this piece of code already.
| @@ -221,7 +221,7 @@ void CUIRankingWnd::add_achievement(CUIXml& xml, shared_str const& achiev_id) | |||
| { | |||
| if (!pSettings->section_exist(achiev_id)) | |||
| { | |||
| Msg("~ Achievement section [%s] does not exist!", achiev_id); | |||
| Msg("~ Achievement section [%s] does not exist!", achiev_id.c_str()); | |||
There was a problem hiding this comment.
It is better to move it into another pull request, so we can merge this piece of code already.
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.
кланголожцы возрадуйтесь