Skip to content
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.

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

fix: Scripts ambiguous base class #1216

Merged
merged 1 commit into from
Oct 9, 2023
Merged

fix: Scripts ambiguous base class #1216

merged 1 commit into from
Oct 9, 2023

Conversation

EmosewaMC
Copy link
Collaborator

@EmosewaMC EmosewaMC commented Oct 9, 2023

Fixes an issue where we needed a C style cast to save these scripts due the the diamond problem wherein the compiler was unable to determine which CppScripts base class to inherit from with multiple inheritance of the same base class.
Moved globals to unnammed namespace
removed empty script logging as missing

Tested that scripts still compile.
Also cache the script that was being raw returned

Copy link
Member

@aronwk-aaron aronwk-aaron left a comment

Choose a reason for hiding this comment

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

LGTM

@aronwk-aaron aronwk-aaron merged commit 500ae4d into main Oct 9, 2023
3 checks passed
@aronwk-aaron aronwk-aaron deleted the Scripts branch October 9, 2023 20:31
@aronwk-aaron aronwk-aaron changed the title Scripts: Fix ambiguous base class fix: Scripts ambiguous base class Oct 23, 2023
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