Skip to content

Commit d630233

Browse files
committed
Fixes for 0.6
* Enable 0.5 on travis * Require 0.5 release and add missing Compat dependency * Fix depwarn for `$`
1 parent 1e2479b commit d630233

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: julia
22
os:
33
- linux
44
julia:
5+
- 0.5
56
- nightly
67
sudo: false
78
notifications:
@@ -12,4 +13,3 @@ script:
1213
- julia -e 'Pkg.test("Combinatorics", coverage=true)'
1314
after_success:
1415
- julia -e 'Pkg.add("Coverage"); cd(Pkg.dir("Combinatorics")); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(process_folder())'
15-

REQUIRE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
julia 0.5-
1+
julia 0.5
2+
Compat 0.9.4
23
Polynomials
34
Iterators

src/combinations.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function next(C::CoolLexCombinations, S::CoolLexIterState)
110110
R3 = S.R3
111111

112112
R0 = R3 & (R3 + 1)
113-
R1 = R0 $ (R0 - 1)
113+
R1 = xor(R0, R0 - 1)
114114
R0 = R1 + 1
115115
R1 &= R3
116116
R0 = max((R0 & R3) - 1, 0)

src/permutations.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ function levicivita{T<:Integer}(p::AbstractVector{T})
198198

199199
while cycles + flips < n
200200
first = findnext(todo, first)
201-
(todo[first] $= true) && return 0
201+
(todo[first] = !todo[first]) && return 0
202202
j = p[first]
203203
(0 < j <= n) || return 0
204204
cycles += 1
205205
while j first
206-
(todo[j] $= true) && return 0
206+
(todo[j] = !todo[j]) && return 0
207207
j = p[j]
208208
(0 < j <= n) || return 0
209209
flips += 1

0 commit comments

Comments
 (0)