Skip to content

Fix Unity build conflict: remove duplicate PdmObjectCollection from cafPdmObjectGroup#13781

Merged
magnesj merged 1 commit intodevfrom
remove-dead-code
Mar 21, 2026
Merged

Fix Unity build conflict: remove duplicate PdmObjectCollection from cafPdmObjectGroup#13781
magnesj merged 1 commit intodevfrom
remove-dead-code

Conversation

@magnesj
Copy link
Member

@magnesj magnesj commented Mar 21, 2026

No description provided.

…afPdmObjectGroup

Remove the unused non-template PdmObjectCollection class from cafPdmObjectGroup.h/.cpp.
This class conflicted with the template caf::PdmObjectCollection<T> in cafPdmObjectCollection.h,
causing MSVC redefinition errors in Unity builds. The class was dead code with no usages
in application code.

Also correct forward declarations in test MainWindow headers from PdmObjectCollection
to PdmObjectGroup, matching actual usage in the .cpp files.
@magnesj magnesj marked this pull request as ready for review March 21, 2026 16:23
@magnesj magnesj merged commit 64a7546 into dev Mar 21, 2026
19 checks passed
@magnesj magnesj deleted the remove-dead-code branch March 21, 2026 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant