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

Rangi42 · Dec 31, 2024 · 72b2a4d · 72b2a4d
1 parent 06daf2a
commit 72b2a4d
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/version.cpp b/src/version.cpp
@@ -14,17 +14,15 @@
 #endif
 
 char const *get_package_version_string() {
-	// The following conditional should be simplified by the compiler.
-	if (strlen(BUILD_VERSION_STRING) == 0) {
-		// Fallback if version string can't be obtained from Git
+	if constexpr (QUOTEDSTRLEN(BUILD_VERSION_STRING) > 0) {
+		return BUILD_VERSION_STRING;
+	}
+	// Fallback if version string can't be obtained from Git
 #ifndef PACKAGE_VERSION_RC
-		return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR
-		) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH);
+	return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR
+	) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH);
 #else
-		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);
+	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);
 #endif
-	} else {
-		return BUILD_VERSION_STRING;
-	}
 }