mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-09-14 05:22:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stratosphere: fix call to non-constexpr strlen in constexpr function

Browse source 
strlen being constexpr is a non-compliant GCC extension; Clang
explicitly rejects it: https://reviews.llvm.org/D23692
This commit is contained in:
Léo Lam 2021-11-05 15:54:55 +01:00
commit 16e738ece2
No known key found for this signature in database
GPG key ID: 0DF30F9081000741
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libraries/libstratosphere/include/stratosphere/settings/settings_types.hpp
View file

@ -62,18 +62,14 @@ namespace ams::settings {
char name[MaxLength]; char name[MaxLength];
static constexpr LanguageCode Encode(const char *name, size_t name_size) { static constexpr LanguageCode Encode(util::string_view name) {
LanguageCode out{}; LanguageCode out{};
for (size_t i = 0; i < MaxLength && i < name_size; i++) { for (size_t i = 0; i < MaxLength && i < name.size(); i++) {
out.name[i] = name[i]; out.name[i] = name[i];
} }
return out; return out;
} }
static constexpr LanguageCode Encode(const char *name) {
return Encode(name, std::strlen(name));
}
template<Language Lang> template<Language Lang>
static constexpr inline LanguageCode EncodeLanguage = [] { static constexpr inline LanguageCode EncodeLanguage = [] {
if constexpr (false) { /* ... */ } if constexpr (false) { /* ... */ }

4
libraries/libstratosphere/include/stratosphere/sm/sm_types.hpp
View file

@ -40,8 +40,8 @@ namespace ams::sm {
return out; return out;
} }
static constexpr ServiceName Encode(const char *name) { static constexpr ServiceName Encode(util::string_view name) {
return Encode(name, std::strlen(name)); return Encode(name.data(), name.size());
} }
}; };