Add STATIC_ASSERT() macro and use it

minetest · Oct 28, 2015 · 688556a · PilzAdam · Oct 30, 2015 · 688556a
1 parent c56d7fe
commit 688556a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/basicmacros.h b/src/basicmacros.h
@@ -38,4 +38,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	C(const C &);             \
 	C &operator=(const C &)
 
+// Fail compilation if condition expr is not met.
+// Note that 'msg' must follow the format of a valid identifier, e.g.
+// STATIC_ASSERT(sizeof(foobar_t) == 40), foobar_t_is_wrong_size);
+#define STATIC_ASSERT(expr, msg) typedef char msg[!!(expr) * 2 - 1]
+
 #endif
diff --git a/src/log.cpp b/src/log.cpp
@@ -135,7 +135,8 @@ class AndroidSystemLogOutput : public ICombinedLogOutput {
 		}
 		void logRaw(LogLevel lev, const std::string &line)
 		{
-			assert(ARRLEN(g_level_to_android) == LL_MAX);
+			STATIC_ASSERT(ARRLEN(g_level_to_android) == LL_MAX,
+				mismatch_between_android_and_internal_loglevels);
 			__android_log_print(g_level_to_android[lev],
 				PROJECT_NAME_C, "%s", line.c_str());
 		}
@@ -228,7 +229,8 @@ const std::string Logger::getLevelLabel(LogLevel lev)
 		"VERBOSE",
 	};
 	assert(lev < LL_MAX && lev >= 0);
-	assert(ARRLEN(names) == LL_MAX);
+	STATIC_ASSERT(ARRLEN(names) == LL_MAX,
+		mismatch_between_loglevel_names_and_enum);
 	return names[lev];
 }