Add @__DIR__ macro.#281
Merged
tkelman merged 2 commits intoJuliaLang:masterfrom Sep 8, 2016
helgee:dirmacro
Merged
Conversation
src/Compat.jl
Outdated
| end | ||
| end | ||
|
|
||
| if VERSION < v"0.6.0-dev.404" |
Contributor
There was a problem hiding this comment.
did you run the commit-name script at the merge commit?
Contributor
There was a problem hiding this comment.
This should probably be !isdefined(Base, Symbol("@__DIR__")) for clarity
Contributor
Author
There was a problem hiding this comment.
@tkelman yes. Since CI says that it was wrong, how do I do it correctly? Or should I use @TotalVerb's suggestion?
Contributor
There was a problem hiding this comment.
isdefined sounds fine to me. Suggests there may be a bug in that script though...
Contributor
There was a problem hiding this comment.
hm, I get
$ git checkout -q 11ff9abd013e8c8f745616057c1076e6c6b761c5 && contrib/commit-name.sh
0.6.0-dev.528
at the merge commit JuliaLang/julia@11ff9ab
Contributor
Author
There was a problem hiding this comment.
Obviously I did not run it at the merge commit. Sorry, my bad!
Contributor
Author
|
With the correct version CI passes 👍 |
dpsanders
pushed a commit
to dpsanders/Compat.jl
that referenced
this pull request
Feb 1, 2017
* Add @__DIR__ macro. * Correct version number.
martinholters
added a commit
that referenced
this pull request
Aug 31, 2018
martinholters
added a commit
that referenced
this pull request
Aug 31, 2018
stevengj
pushed a commit
that referenced
this pull request
Sep 5, 2018
* Remove `take!(::Task)` definition for Julia versions prior to 0.6 Was added in #307. * Remove `redirect_std*(f, stream)` definitions for Julia prior to v0.6 Were added in #275. * Remove at-__DIR__ macro definition for Julia versions prior to 0.6 Was added in #281. * Remove `broadcast` definition for equal-length tuples Was added in #324 and #328 * Remove definitions of `unsafe_get` and `isnull` fallsback Were added in #287. * Remove defintions of `xor` and `⊻` Were added in #289. * Definitions of `numerator` and `denominator` Were added in #290. * Remove defintion of `iszero` Was added in #305. * Remove definition of `>:` Was added in #336 * Remove definition of `take!(::Base.AbstractIOBuffer)` Was added in #290. * Remove definiton of `.&` and `.|` Were added in #306. * Remove definition of `Compat.isapprox` Was added in #309.
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
4 participants
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.
Another nightly PR but this time with a branch and all...