Changeset 89814 in vbox

Timestamp:

Jun 21, 2021 10:46:56 AM (3 years ago)

Author:

vboxsync

Message:

Doxyfile*: map the AssertCompile macros to static_assert so doxygen ignores them and doesn't try associate comments with them.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Doxyfile (modified) (1 diff)
• Main/Doxyfile.Main (modified) (1 diff)
• Runtime/Doxyfile (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Doxyfile

@@ -2056 +2056 @@
                          "DECLINLINE(type)=inline type" \
                          DECL_FORCE_INLINE(type)=DECLINLINE(type) \
-                         AssertCompile(expr) \
-                         AssertCompileSize(a,b) \
-                         AssertCompileSizeAlignment(a,b) \
-                         AssertCompileMemberSizeAlignment(a,b,c) \
-                         AssertCompileMemberAlignment(a,b,c) \
-                         AssertCompileMemberOffset(a,b,c) \
-                         AssertCompile2MemberOffsets(a,b,c) \
                          RT_OS_DARWIN \
                          Q_WS_MAC \
                          Q_WS_X11 \
                          Q_WS_WIN
+
+# Compile assertion hacks.
+PREDEFINED            += \
+    "AssertCompileNS(expr)=static_assert(expr)" \
+    "AssertCompile(expr)=static_assert(expr)" \
+    "AssertCompileSize(type, size)=static_assert(true)" \
+    "AssertCompileSizeAlignment(type, align)=static_assert(true)" \
+    "AssertCompileMemberAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMemberOffset(type, member, off)=static_assert(true)" \
+    "AssertCompile2MemberOffsets(type, member1, member2)=static_assert(true)" \
+    "AssertCompileAdjacentMembers(type, member1, member2)=static_assert(true)" \
+    "AssertCompileMembersAtSameOffset(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMemberSize(type, member, size)=static_assert(true)" \
+    "AssertCompileMemberSizeAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMembersSameSize(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMembersSameSizeAndOffset(type1, member1, type2, member2)=static_assert(true)"
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

trunk/src/VBox/Main/Doxyfile.Main

@@ -2048 +2048 @@
                          RT_C_DECLS_END \
                          RT_C_DECLS_BEGIN
+
+# Compile assertion hacks.
+PREDEFINED            += \
+    "AssertCompileNS(expr)=static_assert(expr)" \
+    "AssertCompile(expr)=static_assert(expr)" \
+    "AssertCompileSize(type, size)=static_assert(true)" \
+    "AssertCompileSizeAlignment(type, align)=static_assert(true)" \
+    "AssertCompileMemberAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMemberOffset(type, member, off)=static_assert(true)" \
+    "AssertCompile2MemberOffsets(type, member1, member2)=static_assert(true)" \
+    "AssertCompileAdjacentMembers(type, member1, member2)=static_assert(true)" \
+    "AssertCompileMembersAtSameOffset(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMemberSize(type, member, size)=static_assert(true)" \
+    "AssertCompileMemberSizeAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMembersSameSize(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMembersSameSizeAndOffset(type1, member1, type2, member2)=static_assert(true)"
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

trunk/src/VBox/Runtime/Doxyfile

@@ -2086 +2086 @@
     RT_MSC_PREREQ_EX(a,b)=b
 
-PREDEFINED += \
-    AssertCompile(expr) \
-    AssertCompileSize(a,b) \
-    AssertCompileSizeAlignment(a,b) \
-    AssertCompileMemberSizeAlignment(a,b,c) \
-    AssertCompileMemberAlignment(a,b,c) \
-    AssertCompileMemberOffset(a,b,c) \
-    AssertCompile2MemberOffsets(a,b,c)
+# Compile assertion hacks.
+PREDEFINED            += \
+    "AssertCompileNS(expr)=static_assert(expr)" \
+    "AssertCompile(expr)=static_assert(expr)" \
+    "AssertCompileSize(type, size)=static_assert(true)" \
+    "AssertCompileSizeAlignment(type, align)=static_assert(true)" \
+    "AssertCompileMemberAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMemberOffset(type, member, off)=static_assert(true)" \
+    "AssertCompile2MemberOffsets(type, member1, member2)=static_assert(true)" \
+    "AssertCompileAdjacentMembers(type, member1, member2)=static_assert(true)" \
+    "AssertCompileMembersAtSameOffset(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMemberSize(type, member, size)=static_assert(true)" \
+    "AssertCompileMemberSizeAlignment(type, member, align)=static_assert(true)" \
+    "AssertCompileMembersSameSize(type1, member1, type2, member2)=static_assert(true)" \
+    "AssertCompileMembersSameSizeAndOffset(type1, member1, type2, member2)=static_assert(true)"
 
 # decl and calling conventions.