Remove default argument of friend function to compile on Mac OS #3
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.
There is an error when compiling Omega on Mac due to the default argument on the function:
friend Conjunct* merge_conjs((Conjunct* conj1, Conjunct* conj2, Merge_Action action, Rel_Body *body = 0);
More details about the error can be found here:
http://stackoverflow.com/questions/22533511/friend-declaration-specifying-a-default-argument-must-be-a-definition
I removed the default argument of the function
merge_conjs
, and pass the argument explicitly wherever it is invoked.