[ehb54/ultrascan3] 058cc4: SOMO: include the guinier_search header after us_u...
Branch: refs/heads/somo-dev Home: https://github.com/ehb54/ultrascan3 Commit: 058cc46533ed5a2a7c00be447136fb558c78ec79 https://github.com/ehb54/ultrascan3/commit/058cc46533ed5a2a7c00be447136fb558... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-05 (Mon, 05 Oct 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h Log Message: ----------- SOMO: include the guinier_search header after us_util.h (Windows build) us_hydrodyn_saxs.h included us_saxs_util_guinier_search.h, which has `using namespace std;`, ahead of us3i_plot.h, whose <QtWidgets> brings in windows.h. Under C++17 std::byte and the Windows SDK's global byte typedef then clash, and every file that includes us_hydrodyn_saxs.h failed to compile with MinGW, under qmake and CMake alike. Include it after us_util.h instead, where SOMO's other headers with `using namespace std;` are (as for ehb54/ultrascan-tickets#1022). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Commit: c91b311a37d89256475b87b07a52ff64a66ed130 https://github.com/ehb54/ultrascan3/commit/c91b311a37d89256475b87b07a52ff64a... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-10-05 (Mon, 05 Oct 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_saxs.h Log Message: ----------- Merge pull request #581 from ehb54/ehb54-issue-1112 SOMO: fix the Windows build (std::byte clash in us_hydrodyn_saxs.h) Compare: https://github.com/ehb54/ultrascan3/compare/5787c3f980cf...c91b311a37d8 To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes