Skip to content

[core] make static vars constexpr for thread safety v3 #18757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 4 commits into from
May 16, 2025
Merged

[core] make static vars constexpr for thread safety v3 #18757

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cffcaa
[core] make static vars constexpr for thread safety v3
ferdymercury May 16, 2025
847c6e8
[nfc] clangf
ferdymercury May 16, 2025
c07eafe
[core] avoid magic number
ferdymercury May 16, 2025
ed1131e
[core] cast to int is unnecessary since strncmp last arg is size_t
ferdymercury May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions core/foundation/src/TClassEdit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,15 +1274,13 @@ int TClassEdit::GetSplit(const char *type, vector<string>& output, int &nestedLo

string TClassEdit::CleanType(const char *typeDesc, int mode, const char **tail)
{
static const char* remove[] = {"class", "const", "volatile", nullptr};
auto initLengthsVector = []() {
std::vector<size_t> create_lengths;
for (int k=0; remove[k]; ++k) {
create_lengths.push_back(strlen(remove[k]));
}
return create_lengths;
};
static std::vector<size_t> lengths{ initLengthsVector() };
constexpr static std::array<const char *, 3> remove{"class", "const", "volatile"};
constexpr static auto lengths = []() constexpr {
std::array<std::size_t, std::size(remove)> ret{};
for (std::size_t i = 0; i < remove.size(); i++)
ret[i] = std::char_traits<char>::length(remove[i]);
return ret;
}();

string result;
result.reserve(strlen(typeDesc)*2);
Expand All @@ -1296,11 +1294,11 @@ string TClassEdit::CleanType(const char *typeDesc, int mode, const char **tail)
}
if (kbl && (mode>=2 || lev==0)) { //remove "const' etc...
int done = 0;
int n = (mode) ? 999 : 1;
size_t n = (mode) ? std::size(remove) : 1;

// loop on all the keywords we want to remove
for (int k=0; k<n && remove[k]; k++) {
int rlen = lengths[k];
for (size_t k = 0; k < n; k++) {
auto rlen = lengths[k];

// Do we have a match
if (strncmp(remove[k],c,rlen)) continue;
Expand Down
Loading