Data: Switch to using C11 style static assert.

tlsa · Feb 27, 2021 · a05e7db · a05e7db
1 parent ab3198b
commit a05e7db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/data.h b/src/data.h
@@ -58,8 +58,9 @@ static inline void cyaml_data_write_pointer(
 {
 	/* Refuse to build on platforms where sizeof pointer would
 	 * lead to \ref CYAML_ERR_INVALID_DATA_SIZE. */
-	cyaml_static_assert(sizeof(char *) >  0);
-	cyaml_static_assert(sizeof(char *) <= sizeof(uint64_t));
+	static_assert(sizeof(char *) >  0, "Incompatible pointer size.");
+	static_assert(sizeof(char *) <= sizeof(uint64_t),
+			"Incompatible pointer size.");
 
 	CYAML_UNUSED(cyaml_data_write((uint64_t)ptr, sizeof(ptr), data_target));
 
@@ -115,8 +116,9 @@ static inline uint8_t * cyaml_data_read_pointer(
 
 	/* Refuse to build on platforms where sizeof pointer would
 	 * lead to \ref CYAML_ERR_INVALID_DATA_SIZE. */
-	cyaml_static_assert(sizeof(char *) >  0);
-	cyaml_static_assert(sizeof(char *) <= sizeof(uint64_t));
+	static_assert(sizeof(char *) >  0, "Incompatible pointer size.");
+	static_assert(sizeof(char *) <= sizeof(uint64_t),
+			"Incompatible pointer size.");
 
 	return (void *)cyaml_data_read(sizeof(char *), data, &err);
 }

diff --git a/src/util.h b/src/util.h
@@ -15,14 +15,6 @@
 #include "cyaml/cyaml.h"
 #include "utf8.h"
 
-/** Compile time assertion macro. */
-#define cyaml_static_assert(e) \
-{ \
-	enum { \
-		cyaml_static_assert_check = 1 / (!!(e)) \
-	}; \
-}
-
 /** Macro to squash unused variable compiler warnings. */
 #define CYAML_UNUSED(_x) ((void)(_x))