Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ULTIMA: Reduce sharing of container classes - #7014

Merged
bluegr merged 3 commits into
scummvm:masterfrom
ccawley2011:ultima-set-queue
Nov 15, 2025
Merged

ULTIMA: Reduce sharing of container classes#7014
bluegr merged 3 commits into
scummvm:masterfrom
ccawley2011:ultima-set-queue

Conversation

@ccawley2011

Copy link
Copy Markdown
Member

Combined with PR #7012, this should make it possible to remove shared/std/containers.h and shared/std/string.h entirely.

@OMGPizzaGuy

Copy link
Copy Markdown
Member

First two commits look good to me. I'm not sure on the third - any chance of reviving #5950 ?

namespace Ultima8 {

template<class T>
class Set {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to use this over "common/std/set.h" ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, but the two classes are implemented differently and replacing the use of it in Ultima 8 is a bit more involved, so I'll leave replacing it to someone else.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I believe the sets were only used in checking for duplicate processes the load game and for the debugging traces for usecode - I'll look into this soon and replace them if that's all.

@bluegr

bluegr commented Nov 15, 2025

Copy link
Copy Markdown
Member

Thanks! Great work. Merging

@bluegr
bluegr merged commit c618a5f into scummvm:master Nov 15, 2025
1 check passed
@ccawley2011
ccawley2011 deleted the ultima-set-queue branch November 16, 2025 01:47
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.

3 participants