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

Use custom namespace for asio to prevent UE collision #418

Merged
merged 2 commits into from
May 7, 2024

Conversation

mikeseese
Copy link
Contributor

@mikeseese mikeseese commented May 7, 2024

This PR fixes #404 by renaming the asio namespace to asio_sockio as well as any global functions in the asio library.

This PR is dependent on these PRs:

This currently PR does not update the submodules as it didn't make sense to make a PR that referenced downstream repos temporarily until the dependent PRs are merged into the upstream repos. I can update this PR to have the updated submodules once those other PRs are merged, but you can also merge beforehand and update the submodules yourself if you'd prefer.

If you want to test these changes, the easiest way is to test the forked redwood branch from https://github.com/redwoodmmo/SocketIOClient-Unreal/ which resembles the final merged state (other than a change to the plugin's engine version)

@getnamo
Copy link
Owner

getnamo commented May 7, 2024

Good idea for interoping with other plugins in unreal. I went ahead and merged the submodule changes. Update this PR to include the submodule ref updates and I'll merge it.

@mikeseese
Copy link
Contributor Author

Ok @getnamo, this PR is now ready

@getnamo getnamo merged commit 879c927 into getnamo:master May 7, 2024
@getnamo
Copy link
Owner

getnamo commented May 7, 2024

I merged this, go ahead and check the master branch didn't have any regressions. Will do sanity checks on this merge later when I do a 5.4 release.

getnamo added a commit that referenced this pull request May 7, 2024
@mikeseese
Copy link
Contributor Author

I've been testing these changes in 5.3.2 for a month now and haven't had any issues with the features I use. My project is in the middle of a refactor so I can't test it with 5.4.1 yet; might take me a day or two to get to that.

@mikeseese mikeseese deleted the fix/namespace-collision branch May 8, 2024 15:55
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.

ASIO library version conflict with Unreal 5.3
2 participants