Add STATIC_ASSERT() macro and use it

kwolekr · kwolekr · commit 688556a5d191 · 2015-10-27T22:27:32.000-04:00
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];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ class AndroidSystemLogOutput : public ICombinedLogOutput {`
`135`	`135`	`}`
`136`	`136`	`void logRaw(LogLevel lev, const std::string &line)`
`137`	`137`	`{`
`138`		`- assert(ARRLEN(g_level_to_android) == LL_MAX);`
	`138`	`+ STATIC_ASSERT(ARRLEN(g_level_to_android) == LL_MAX,`
	`139`	`+ mismatch_between_android_and_internal_loglevels);`
`139`	`140`	`__android_log_print(g_level_to_android[lev],`
`140`	`141`	`PROJECT_NAME_C, "%s", line.c_str());`
`141`	`142`	`}`
`@@ -228,7 +229,8 @@ const std::string Logger::getLevelLabel(LogLevel lev)`
`228`	`229`	`"VERBOSE",`
`229`	`230`	`};`
`230`	`231`	`assert(lev < LL_MAX && lev >= 0);`
`231`		`- assert(ARRLEN(names) == LL_MAX);`
	`232`	`+ STATIC_ASSERT(ARRLEN(names) == LL_MAX,`
	`233`	`+ mismatch_between_loglevel_names_and_enum);`
`232`	`234`	`return names[lev];`
`233`	`235`	`}`
`234`	`236`