Looks like we still need this compiler bug workaround

BRL-CAD · Dec 21, 2023 · 1fab22d · 1fab22d
1 parent f4172ea
commit 1fab22d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/opennurbs/CMakeLists.txt b/opennurbs/CMakeLists.txt
@@ -42,7 +42,7 @@ if (ENABLE_OPENNURBS)
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_font.patch
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_locale.patch
     #COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_lock.patch
-    #COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_lookup.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_lookup.patch
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_object_history.patch
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_optimize.patch
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_polyline.patch

diff --git a/opennurbs/opennurbs_lookup.patch b/opennurbs/opennurbs_lookup.patch
@@ -1,16 +1,16 @@
---- opennurbs/opennurbs_lookup.cpp	2023-09-09 13:52:46.161646361 -0400
-+++ openNURBS/opennurbs_lookup.cpp	2023-09-09 13:43:33.720976246 -0400
-@@ -709,6 +709,9 @@
+--- opennurbs/opennurbs_lookup.cpp	2023-12-21 11:57:27.113240837 -0500
++++ OPENNURBS_BLD/opennurbs_lookup.cpp	2023-12-21 11:58:28.000088916 -0500
+@@ -696,6 +696,9 @@
    return m_active_id_count;
  }
 
 +// NOTE - optimization currently disabled for FirstElement due to compiler bug
 +// in VS2022 - see https://github.com/microsoft/vcpkg/issues/19561
 +#pragma optimize("", off)
- struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
+ ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
  {
-   struct SN_ELEMENT* e=0;
-@@ -768,6 +771,7 @@
+   SN_ELEMENT* e=nullptr;
+@@ -756,6 +759,7 @@
    }
    return e;
  }