Changeset 97968 in vbox for trunk/include/iprt/cpp

Timestamp:

Jan 3, 2023 10:19:59 PM (2 years ago)

Author:

vboxsync

Message:

iprt/cpp/hardavlrange.h: Tweaked AssertCompile hack.

File:

• trunk/include/iprt/cpp/hardavlrange.h (modified) (6 diffs)

trunk/include/iprt/cpp/hardavlrange.h

@@ -696 +696 @@
                     if (pLeftNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),
@@ -732 +732 @@
                     if (pRightNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),
@@ -806 +806 @@
                     if (pRightNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),
@@ -842 +842 @@
                     if (pLeftNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),
@@ -930 +930 @@
                     if (pLeftNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),
@@ -960 +960 @@
                     if (pRightNode)
                     {
-#if RT_GNUC_PREREQ_EX(4,7, 1) /* 32-bit 4.4.7 has trouble, dunno when it started working exactly */
-                        AssertCompile(kMaxStack > 6);
+#if RT_GNUC_PREREQ_EX(4,7,1) && defined(RTASSERT_HAVE_STATIC_ASSERT) /* 32-bit 4.4.7 has trouble, dunno when it started working */
+                        AssertCompile(kMaxStack > 6);                /* exactly. Seems having static_assert is required. */
 #endif
                         AssertMsgReturnStmt(cEntries < RT_ELEMENTS(apEntries),