[us-commits] [ehb54/ultrascan3] 3fdb6c: SOMO: guard duplicated uhshs_data struct; dedup qw...

[emre brookes]

  Branch: refs/heads/ehb54-issue-943
  Home:   https://github.com/ehb54/ultrascan3
  Commit: 3fdb6c2bf2ec623d2a0fbc7dbef7ac3ee8800f05
      https://github.com/ehb54/ultrascan3/commit/3fdb6c2bf2ec623d2a0fbc7dbef7ac3ee8800f05
  Author: ehb54 <brookes at uthscsa.edu>
  Date:   2026-07-04 (Sat, 04 Jul 2026)

  Changed paths:
    M us_somo/develop/CMakeLists.txt
    M us_somo/develop/include/us_hydrodyn_dad_simulate.h
    M us_somo/develop/include/us_hydrodyn_mals_saxs_simulate.h
    M us_somo/develop/include/us_hydrodyn_mals_simulate.h
    M us_somo/develop/include/us_hydrodyn_saxs_hplc_simulate.h

  Log Message:
  -----------
  SOMO: guard duplicated uhshs_data struct; dedup qwt scrollbar/zoomer moc

- struct uhshs_data is copy-pasted (byte-identical) into four *_simulate.h
  headers; the combined AUTOMOC TU includes several at once -> redefinition.
  Wrap each with #ifndef UHSHS_DATA_STRUCT_DEFINED.
- scrollbar/scrollzoomer exist in both src/qwt/ and include/qwt/ (identical);
  AUTOMOC mocs both (listed include/qwt header + src/qwt adjacency to the .cpp)
  -> duplicate moc symbols. SKIP_AUTOMOC on the src/qwt/*.cpp keeps one moc.

Refs ehb54/ultrascan-tickets#943

Co-Authored-By: Claude Opus 4.8 <noreply at anthropic.com>



To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications