Refactor nested if causing error C1061 on MSVC. #6101
Merged
Conversation
This file contains hidden or 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
3 tasks
ggerganov
reviewed
Mar 16, 2024
common/common.cpp
Outdated
| } | ||
|
|
||
| return hash; | ||
| } |
Member
There was a problem hiding this comment.
This is C++14 - we support just C++11 (https://stackoverflow.com/questions/45097171/the-body-of-constexpr-function-not-a-return-statement)
Probably, just remove the elses from the if-else chain - this is not performance critical code
ggerganov
approved these changes
Mar 16, 2024
ggerganov
reviewed
Mar 16, 2024
| std::replace(arg.begin(), arg.end(), '_', '-'); | ||
| } | ||
|
|
||
| bool arg_found = false; |
Member
There was a problem hiding this comment.
Btw, to avoid this arg_found everywhere, we should move this if-chain in a bool function and return early on success
Contributor
Author
There was a problem hiding this comment.
I'll submit another PR.
hodlen
pushed a commit
to hodlen/llama.cpp
that referenced
this pull request
Apr 3, 2024
* Refactor nested if causing error C1061 on MSVC. * Revert back and remove else's. * Add flag to track found arguments.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 PR refactors the nested if-else using switch-case to resolve error C1061 using MSVC.
Note: there is also a temporary workaround provided by Deacon8 here #6096
Fixes #6093