Repository navigation
Conversation
…long (macOS build) cListener::receiveSignal() takes intval_t (int64_t). On Linux int64_t is long, so the overrides declared with a long parameter compile; on macOS it is long long, so they declare a new overload instead, and 'override' makes that an error. The build fails in CoreControl, D2dBinder and D2dAmc. The parameter is declared as omnetpp::intval_t, the base class's type. On Linux this is the same type as before, so nothing changes there.
Author
|
Thanks! Closing in favour of 57974ee on v1.8.x. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #313.
cListener::receiveSignal()takesintval_t(int64_t). Five overrides declare that parameter aslong. On Linuxint64_tislong, so they compile and CI passes; on macOS it islong long, so they declare a new overload, andoverridemakes that an error. This PR declares the parameter asomnetpp::intval_tin:src/simu5g/corenetwork/coreControl/CoreControl.h/.ccsrc/simu5g/stack/d2d/binder/D2dBinder.h/.ccsrc/simu5g/stack/d2d/mac/amc/D2dAmc.hThis is the same change as #312, which its author closed without it being merged.
No behaviour change on Linux
On Linux
omnetpp::intval_tandlongare the same type, so the change does not affect the compiled code there. The fingerprint workflow passes on this branch in my fork, with the recorded fingerprints unchanged: 222/222 in release and 222/222 in debug mode (https://github.com/anies1212/Simu5G/actions/runs/42612321033).Tested on macOS
macOS 26.6.2 (arm64), Apple clang 17.0.0, OMNeT++ 6.4.0, INET 4.7.0:
simulations/nr/standalone-c VoIP-DLandsimulations/nr/standalone_multicell-c CBR-DLrun to the endtests/fingerprint/fingerprints(release): all 222 configurations run to completion, with no errorsNote: on macOS, 114 of the 222 fingerprints differ from the recorded (Linux) values:
szin 107,tplxandtilxin 45 each,~tNlin 38. Without this change Simu5G does not build on macOS, so there is no "before" to compare these with, and I have not looked into where the difference comes from. I'm mentioning it in case it's useful; I don't think it is caused by this change.