From eb4e1c4d20654f914ebac6ab08ec06ac29cc0fa8 Mon Sep 17 00:00:00 2001 From: doylet Date: Sat, 3 Oct 2026 22:36:24 +1000 Subject: [PATCH] Fix issue with constant comparison raising warnings on MSVC for tautological comparison --- Single-Header/dn_single_header.cpp | 8 ++++---- Single-Header/dn_single_header.h | 20 +++++++++++--------- Source/dn.cpp | 6 +++--- Source/dn.h | 18 ++++++++++-------- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Single-Header/dn_single_header.cpp b/Single-Header/dn_single_header.cpp index 785836b..1c6749d 100644 --- a/Single-Header/dn_single_header.cpp +++ b/Single-Header/dn_single_header.cpp @@ -1,4 +1,4 @@ -// Generated by the DN single header generator 2026-09-29 22:28:12 +// Generated by the DN single header generator 2026-10-03 22:35:58 // DN: Single header generator commented out => #if defined(_CLANGD) // #define DN_WITH_TESTS 1 @@ -8647,9 +8647,9 @@ DN_API bool DN_RectContainsRect(DN_Rect a, DN_Rect b) DN_API DN_Rect DN_RectExpand(DN_Rect a, DN_F32 amount) { - DN_Rect result = a; - result.pos -= amount; - result.size += (amount * 2.f); + DN_Rect result = a; + result.pos -= amount; + result.size += (amount * 2.f); return result; } diff --git a/Single-Header/dn_single_header.h b/Single-Header/dn_single_header.h index 806fd9e..8cab5b4 100644 --- a/Single-Header/dn_single_header.h +++ b/Single-Header/dn_single_header.h @@ -1,4 +1,4 @@ -// Generated by the DN single header generator 2026-09-29 22:28:11 +// Generated by the DN single header generator 2026-10-03 22:35:58 #if !defined(DN_H) #define DN_H @@ -5905,14 +5905,15 @@ DN_API DN_RaycastV2 DN_RaycastLineIntersectV2 DN_AssertF(!last_ptr, "Invalid list: first is null but last is set (%p)"); \ } \ DN_AssertF(!item_to_add_ptr->field_for_next, "Invalid list: pointer to add already has next set (%p), should be null", item_to_add_ptr->field_for_next); \ - if (add == DN_AddType_Append) { \ + DN_AddType add_type_ = add; \ + if (add_type_ == DN_AddType_Append) { \ if (!first_ptr) \ first_ptr = item_to_add_ptr; \ if (last_ptr) \ last_ptr->field_for_next = item_to_add_ptr; \ last_ptr = item_to_add_ptr; \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ item_to_add_ptr->field_for_next = first_ptr; \ first_ptr = item_to_add_ptr; \ if (!last_ptr) \ @@ -5954,32 +5955,33 @@ DN_API DN_RaycastV2 DN_RaycastLineIntersectV2 DN_AssertF(!(dest_ptr)->field_for_next, "Invalid list: First and last is being initialised to dest (%p) but dest has next (%p) set, dest cannot be assigned as the last pointer", (dest_ptr), (dest_ptr)->field_for_next); \ DN_AssertF(!(dest_ptr)->field_for_prev, "Invalid list: First and last is being initialised to dest (%p) but dest has prev (%p) set, dest cannot be assigned as the first pointer", (dest_ptr), (dest_ptr)->field_for_prev); \ } \ + DN_AddType add_type_ = add; \ if ((src_ptr)) { \ - if (add == DN_AddType_Append) { \ + if (add_type_ == DN_AddType_Append) { \ (src_ptr)->field_for_next = (dest_ptr) ? (dest_ptr)->field_for_next : nullptr; \ (src_ptr)->field_for_prev = (dest_ptr); \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ (src_ptr)->field_for_next = (dest_ptr); \ (src_ptr)->field_for_prev = (dest_ptr) ? (dest_ptr)->field_for_prev : nullptr; \ } \ } \ if ((dest_ptr)) { \ DN_ListDebugVerifyListContainsPtr(Type, first_ptr, field_for_next, dest_ptr); \ - if (add == DN_AddType_Append) { \ + if (add_type_ == DN_AddType_Append) { \ if ((dest_ptr)->field_for_next) \ (dest_ptr)->field_for_next->field_for_prev = (src_ptr); \ (dest_ptr)->field_for_next = (src_ptr); \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ if ((dest_ptr)->field_for_prev) \ (dest_ptr)->field_for_prev->field_for_next = (src_ptr); \ (dest_ptr)->field_for_prev = (src_ptr); \ } \ } \ - if ((dest_ptr) == (first_ptr) && add == DN_AddType_Prepend) \ + if ((dest_ptr) == (first_ptr) && add_type_ == DN_AddType_Prepend) \ (first_ptr) = (src_ptr); \ - if ((dest_ptr) == (last_ptr) && add == DN_AddType_Append) \ + if ((dest_ptr) == (last_ptr) && add_type_ == DN_AddType_Append) \ (last_ptr) = (src_ptr); \ } while (0) diff --git a/Source/dn.cpp b/Source/dn.cpp index 511493a..4ae44e2 100644 --- a/Source/dn.cpp +++ b/Source/dn.cpp @@ -8645,9 +8645,9 @@ DN_API bool DN_RectContainsRect(DN_Rect a, DN_Rect b) DN_API DN_Rect DN_RectExpand(DN_Rect a, DN_F32 amount) { - DN_Rect result = a; - result.pos -= amount; - result.size += (amount * 2.f); + DN_Rect result = a; + result.pos -= amount; + result.size += (amount * 2.f); return result; } diff --git a/Source/dn.h b/Source/dn.h index 0259639..f709480 100644 --- a/Source/dn.h +++ b/Source/dn.h @@ -3975,14 +3975,15 @@ DN_API DN_RaycastV2 DN_RaycastLineIntersectV2 DN_AssertF(!last_ptr, "Invalid list: first is null but last is set (%p)"); \ } \ DN_AssertF(!item_to_add_ptr->field_for_next, "Invalid list: pointer to add already has next set (%p), should be null", item_to_add_ptr->field_for_next); \ - if (add == DN_AddType_Append) { \ + DN_AddType add_type_ = add; \ + if (add_type_ == DN_AddType_Append) { \ if (!first_ptr) \ first_ptr = item_to_add_ptr; \ if (last_ptr) \ last_ptr->field_for_next = item_to_add_ptr; \ last_ptr = item_to_add_ptr; \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ item_to_add_ptr->field_for_next = first_ptr; \ first_ptr = item_to_add_ptr; \ if (!last_ptr) \ @@ -4024,32 +4025,33 @@ DN_API DN_RaycastV2 DN_RaycastLineIntersectV2 DN_AssertF(!(dest_ptr)->field_for_next, "Invalid list: First and last is being initialised to dest (%p) but dest has next (%p) set, dest cannot be assigned as the last pointer", (dest_ptr), (dest_ptr)->field_for_next); \ DN_AssertF(!(dest_ptr)->field_for_prev, "Invalid list: First and last is being initialised to dest (%p) but dest has prev (%p) set, dest cannot be assigned as the first pointer", (dest_ptr), (dest_ptr)->field_for_prev); \ } \ + DN_AddType add_type_ = add; \ if ((src_ptr)) { \ - if (add == DN_AddType_Append) { \ + if (add_type_ == DN_AddType_Append) { \ (src_ptr)->field_for_next = (dest_ptr) ? (dest_ptr)->field_for_next : nullptr; \ (src_ptr)->field_for_prev = (dest_ptr); \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ (src_ptr)->field_for_next = (dest_ptr); \ (src_ptr)->field_for_prev = (dest_ptr) ? (dest_ptr)->field_for_prev : nullptr; \ } \ } \ if ((dest_ptr)) { \ DN_ListDebugVerifyListContainsPtr(Type, first_ptr, field_for_next, dest_ptr); \ - if (add == DN_AddType_Append) { \ + if (add_type_ == DN_AddType_Append) { \ if ((dest_ptr)->field_for_next) \ (dest_ptr)->field_for_next->field_for_prev = (src_ptr); \ (dest_ptr)->field_for_next = (src_ptr); \ } else { \ - DN_Assert(add == DN_AddType_Prepend); \ + DN_Assert(add_type_ == DN_AddType_Prepend); \ if ((dest_ptr)->field_for_prev) \ (dest_ptr)->field_for_prev->field_for_next = (src_ptr); \ (dest_ptr)->field_for_prev = (src_ptr); \ } \ } \ - if ((dest_ptr) == (first_ptr) && add == DN_AddType_Prepend) \ + if ((dest_ptr) == (first_ptr) && add_type_ == DN_AddType_Prepend) \ (first_ptr) = (src_ptr); \ - if ((dest_ptr) == (last_ptr) && add == DN_AddType_Append) \ + if ((dest_ptr) == (last_ptr) && add_type_ == DN_AddType_Append) \ (last_ptr) = (src_ptr); \ } while (0)