Move OptionSet to its own namespace
#69785
Merged
Conversation
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
ahoppen
requested review from
artemcm,
AnthonyLatsis,
hborla,
slavapestov,
xedin,
tshortli,
bnbarham,
rintaro,
hamishknight,
adrian-prantl,
zoecarver,
hyp,
egorzhdan,
CodaFi and
DougGregor
as code owners
|
@swift-ci Please smoke test |
rintaro
reviewed
Nov 13, 2023
| @@ -151,7 +152,7 @@ class OptionSet { | |||
| Flags>::value, | |||
| "operator| should produce an OptionSet"); | |||
| }; | |||
|
|
|||
| } // end namespace optionset | |||
There was a problem hiding this comment.
Does using namespace have any effect in Swift? If not, how about
Suggested change
| } // end namespace optionset | |
| } // end namespace optionset | |
| using namespace optionset; |
and that's it (with some doc-comment for this weird hack).
There was a problem hiding this comment.
using namespace is ignored by Swift when it imports C++ headers.
There was a problem hiding this comment.
Oh, nice idea. I hadn’t thought of that. I tried using OptionSet = optionset::OptionSet, which didn’t work but this is much cleaner (and doesn’t require any downstream changes).
The type was colliding with the `OptionSet` type in the Swift stdlib when using Swift from C++.
ahoppen
force-pushed
the
ahoppen/move-optionset
branch
from
9224f14 to
62ffdf2
Compare
|
@swift-ci Please smoke test |
rintaro
approved these changes
Nov 14, 2023
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.
The type was colliding with the
OptionSettype in the Swift stdlib when using Swift from C++ (ie. when we were importing a the generated<SwiftModule>-Swift.hbridging header.