Merge pull request #56 from JuliaArrays/anj/06

Fix some method ambiguities on 0.6
JuliaArrays · Oct 30, 2017 · 0797c7e · 0797c7e
2 parents 2ed35eb + af3458a
commit 0797c7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ os:
    - osx
 julia:
    - 0.5
+   - 0.6
    - nightly
 after_success:
    - julia -e 'cd(Pkg.dir("ArrayViews")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';

diff --git a/src/contrank.jl b/src/contrank.jl
@@ -33,17 +33,18 @@ restrict_crank{N}(::Type{ContRank{N}}, ::NTuple{0,Int}) = ContRank{0}
 contrank() = ContRank{0}
 
 # 1D
-@compat contrank(i::Union{Colon,UnitRange}) = ContRank{1}
+contrank(i::Union{Colon,UnitRange}) = ContRank{1}
 contrank(i::Subs) = ContRank{0}
 
 # 2D
-@compat contrank(i1::Colon, i2::Union{Colon,UnitRange}) = ContRank{2}
+contrank(i1::Colon, i2::Union{Colon,UnitRange}) = ContRank{2}
 contrank(i1::Colon, i2::Subs) = ContRank{1}
 contrank(i1::UnitRange, i2::Subs) = ContRank{1}
 contrank(i1::Subs, i2::Subs) = ContRank{0}
 
 # 3D
-@compat contrank(i1::Colon, i2::Colon, i3::Union{Colon,UnitRange}) = ContRank{3}
+contrank(i1::Colon, i2::Colon, i3::Colon) = ContRank{3}
+contrank(i1::Colon, i2::Colon, i3::UnitRange) = ContRank{3}
 contrank(i1::Colon, i2::Colon, i3::Subs) = ContRank{2}
 contrank(i1::Colon, i2::UnitRange, i3::Subs) = ContRank{2}
 contrank(i1::Colon, i2::Subs, i3::Subs) = ContRank{1}

diff --git a/src/subviews.jl b/src/subviews.jl
@@ -122,6 +122,7 @@ end
 
 # General
 
+roffset(a::ContiguousArray, i1::Colon, i2::Colon, i3::Colon, i4::Colon) = 0
 roffset(a::ContiguousArray, i1::Colon, i2::Colon, i3::Colon, i4::Colon, I::Colon...) = 0
 
 function roffset(a::ContiguousArray, i1::Subs, i2::Subs, i3::Subs, i4::Subs, I::Subs...)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ os: @@
        - osx
     julia:
        - 0.5
+       - 0.6
        - nightly
     after_success:
        - julia -e 'cd(Pkg.dir("ArrayViews")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
@@ Expand Down @@