Fix macOS build regression after #16212 #16221
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
|
@swift-ci please smoke test |
|
@swift-ci please clean smoke test linux |
nathawes
pushed a commit
to nathawes/swift
that referenced
this pull request
Apr 28, 2018
bob-wilson
added a commit
to bob-wilson/swift
that referenced
this pull request
May 4, 2018
The Clang version checks introduced in swiftlang#16212 and swiftlang#16221 do not work well. The __clang_major__ macro is defined differently for Apple builds of Clang, and the __APPLE_CC__ macro is obsolete and not useful. The good news is that those checks appear to be unnecessary. The version of Clang used with Swift 4.2 (based on LLVM 6.0) accepts the code without the template keyword in the places where the DEPENDENT_TEMPLATE2 macro was being used. This also corrects a mistake in swiftlang#16221 where the non-Clang/GCC definition of DEPENDENT_TEMPLATE was changed to use the template keyword.
bob-wilson
pushed a commit
to bob-wilson/swift
that referenced
this pull request
Sep 14, 2018
bob-wilson
added a commit
to bob-wilson/swift
that referenced
this pull request
Sep 14, 2018
The Clang version checks introduced in swiftlang#16212 and swiftlang#16221 do not work well. The __clang_major__ macro is defined differently for Apple builds of Clang, and the __APPLE_CC__ macro is obsolete and not useful. The good news is that those checks appear to be unnecessary. The version of Clang used with Swift 4.2 (based on LLVM 6.0) accepts the code without the template keyword in the places where the DEPENDENT_TEMPLATE2 macro was being used. This also corrects a mistake in swiftlang#16221 where the non-Clang/GCC definition of DEPENDENT_TEMPLATE was changed to use the template keyword.
mikeash
pushed a commit
to mikeash/swift
that referenced
this pull request
Nov 30, 2018
mikeash
pushed a commit
to mikeash/swift
that referenced
this pull request
Nov 30, 2018
The Clang version checks introduced in swiftlang#16212 and swiftlang#16221 do not work well. The __clang_major__ macro is defined differently for Apple builds of Clang, and the __APPLE_CC__ macro is obsolete and not useful. The good news is that those checks appear to be unnecessary. The version of Clang used with Swift 4.2 (based on LLVM 6.0) accepts the code without the template keyword in the places where the DEPENDENT_TEMPLATE2 macro was being used. This also corrects a mistake in swiftlang#16221 where the non-Clang/GCC definition of DEPENDENT_TEMPLATE was changed to use the template keyword.
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.
No description provided.