llama : C++20 compatibility for u8 strings #8408
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
Green-Sky
reviewed
Jul 10, 2024
| #if __cplusplus >= 202000L | ||
| #define LU8(x) (const char*)(u8##x) | ||
| #else | ||
| #define LU8(x) u8##x |
There was a problem hiding this comment.
why prefix the macro with L ? , that makes it seem like it is a wide string.
There was a problem hiding this comment.
as in llama, could be T as well. I wanted three characters to minimize the risk of collisions, as simply U8 looks risky.
Green-Sky
reviewed
Jul 10, 2024
| @@ -57,6 +57,12 @@ | |||
| #include <io.h> | |||
| #endif | |||
|
|
|||
| #if __cplusplus >= 202000L | |||
| #define LU8(x) (const char*)(u8##x) | |||
There was a problem hiding this comment.
you should use a proper cast, instead of a c-style one.
There was a problem hiding this comment.
Why? It's not like there are any "proper" casts in the file itself. All other casts are C-style.
ggerganov
approved these changes
Jul 10, 2024
Nexesenex
pushed a commit
to Nexesenex/croco.cpp
that referenced
this pull request
Jul 11, 2024
arthw
pushed a commit
to arthw/llama.cpp
that referenced
this pull request
Jul 13, 2024
arthw
pushed a commit
to arthw/llama.cpp
that referenced
this pull request
Jul 13, 2024
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.
This PR fixes the compilation errors when compiling with C++20 (which may come from above incase llama.cpp is a subdir)
In C++20
char8_tis distinct fromchar. That's whyu8"string"(beingconst char8_t*) cannot be implicitly cast toconst char*. The PR adds a macro which performs the explicit cast if necessary