Use if constexpr to guarantee compile-time simplification (#1590)

This commit is contained in:
Rangi
2024-12-30 23:44:12 -05:00
committed by GitHub
parent 06daf2a9b5
commit 72b2a4d7c0

View File

@@ -14,8 +14,9 @@
#endif #endif
char const *get_package_version_string() { char const *get_package_version_string() {
// The following conditional should be simplified by the compiler. if constexpr (QUOTEDSTRLEN(BUILD_VERSION_STRING) > 0) {
if (strlen(BUILD_VERSION_STRING) == 0) { return BUILD_VERSION_STRING;
}
// Fallback if version string can't be obtained from Git // Fallback if version string can't be obtained from Git
#ifndef PACKAGE_VERSION_RC #ifndef PACKAGE_VERSION_RC
return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR
@@ -24,7 +25,4 @@ char const *get_package_version_string() {
return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR
) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH) "-rc" EXPAND_AND_STR(PACKAGE_VERSION_RC); ) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH) "-rc" EXPAND_AND_STR(PACKAGE_VERSION_RC);
#endif #endif
} else {
return BUILD_VERSION_STRING;
}
} }