Skip to content

[openNURBS] Update optimizer workaround condition from upstream #6154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvieth merged 2 commits into from
Dec 25, 2024
Merged

[openNURBS] Update optimizer workaround condition from upstream #6154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd96e9f
[openNURBS] Update workaround condition from upstream
WangWeiLin-MV Oct 17, 2024
cb2abbb
[openNURBS] Update workaround condition before _MSC_VER 1950
WangWeiLin-MV Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,13 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const
return m_active_id_count;
}

#if (_MSC_VER >= 1930 && _MSC_VER <= 1941)
#if (_MSC_VER >= 1930 && _MSC_VER <= 1949)
// Solves internal compiler error on MSVC 2022
// (see https://github.com/microsoft/vcpkg/issues/19561)
#define ON_VS2022_COMPILER_CRASH
#endif

#if defined(ON_VS2022_COMPILER_CRASH)
#pragma optimize("", off)
#endif
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
Expand Down Expand Up @@ -722,7 +726,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
}
return e;
}
#if (_MSC_VER >= 1930 && _MSC_VER <= 1941)
#if defined(ON_VS2022_COMPILER_CRASH)
#pragma optimize("", on)
#endif

Expand Down