Skip to content

[Helper] ScopedAdvancedTimer: add a compile-time check on string argument in macros #6036

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
hugtalbot merged 4 commits into from
Mar 24, 2026
+5 −2
Merged

[Helper] ScopedAdvancedTimer: add a compile-time check on string argument in macros #6036

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14d58c5
add a consteval check if trying to use the compile-time-string versio…
fredroy Mar 19, 2026
e271923
replace lambda with function (consteval lambda needs updated compilers)
fredroy Mar 19, 2026
3f897c4
Merge branch 'master' into scopedtimerdyn_ensure_constexpr
hugtalbot Mar 24, 2026
defbdc7
Merge branch 'master' into scopedtimerdyn_ensure_constexpr
hugtalbot Mar 24, 2026
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
7 changes: 5 additions & 2 deletions Sofa/framework/Helper/src/sofa/helper/ScopedAdvancedTimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ ScopedAdvancedTimer::ScopedAdvancedTimer(const char* message, T* obj)
#define SCOPED_TIMER_VARNAME_AD(varname, name)
#endif

#define SCOPED_TIMER(name) SCOPED_TIMER_TR(name); SCOPED_TIMER_AD(name)
consteval const char* ensure_name_must_be_a_compile_time_string_literal(const char* s) { return s; }
#define ENSURE_SCOPED_ADVANCED_TIMER_ARG_IS_CONSTEXPR(s) ensure_name_must_be_a_compile_time_string_literal(s)

#define SCOPED_TIMER(name) ENSURE_SCOPED_ADVANCED_TIMER_ARG_IS_CONSTEXPR(name) ; SCOPED_TIMER_TR(name); SCOPED_TIMER_AD(name)
#define SCOPED_TIMER_DYN(name) SCOPED_TIMER_DYN_TR(name); SCOPED_TIMER_AD(name)
#define SCOPED_TIMER_VARNAME(varname, name) SCOPED_TIMER_VARNAME_TR(varname, name); SCOPED_TIMER_VARNAME_AD(varname, name)
#define SCOPED_TIMER_VARNAME(varname, name) ENSURE_SCOPED_ADVANCED_TIMER_ARG_IS_CONSTEXPR(name) ; SCOPED_TIMER_VARNAME_TR(varname, name); SCOPED_TIMER_VARNAME_AD(varname, name)
#define SCOPED_TIMER_VARNAME_DYN(varname, name) SCOPED_TIMER_VARNAME_DYN_TR(varname, name); SCOPED_TIMER_VARNAME_AD(varname, name)
Loading