Skip to content

Commit

Permalink
Merge pull request #270 from yuyichao/yyc/0.6
Browse files Browse the repository at this point in the history
Fix 0.6 abstract type declaration depwarn
  • Loading branch information
yuyichao authored Feb 12, 2017
2 parents 79a03f1 + 5b09322 commit e9a9cae
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.4
Compat 0.9.4
Compat 0.17.0
4 changes: 2 additions & 2 deletions src/container_loops.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Base.values
## iteration.


abstract AbstractExcludeLast{ContainerType <: SAContainer}
@compat abstract type AbstractExcludeLast{ContainerType <: SAContainer} end

immutable SDMExcludeLast{ContainerType <: SDMContainer} <:
AbstractExcludeLast{ContainerType}
Expand All @@ -38,7 +38,7 @@ eltype(s::AbstractExcludeLast) = eltype(s.m)
## This holds an object describing an include-last
## iteration.

abstract AbstractIncludeLast{ContainerType <: SAContainer}
@compat abstract type AbstractIncludeLast{ContainerType <: SAContainer} end



Expand Down
4 changes: 2 additions & 2 deletions src/heaps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
# HT: handle type
# VT: value type

abstract AbstractHeap{VT}
@compat abstract type AbstractHeap{VT} end

abstract AbstractMutableHeap{VT,HT} <: AbstractHeap{VT}
@compat abstract type AbstractMutableHeap{VT,HT} <: AbstractHeap{VT} end

# comparer

Expand Down
2 changes: 1 addition & 1 deletion src/list.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
abstract LinkedList{T}
@compat abstract type LinkedList{T} end

type Nil{T} <: LinkedList{T}
end
Expand Down
8 changes: 3 additions & 5 deletions src/tokens.jl
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
## Token interface to a container. A token is the address
## of an item in a container. The token has two parts: the
## container and the item's address. The address is of type
## AbstractSemiToken.
## AbstractSemiToken.


module Tokens

using Compat

abstract AbstractSemiToken
@compat abstract type AbstractSemiToken end

immutable IntSemiToken <: AbstractSemiToken
address::Int
end

end



0 comments on commit e9a9cae

Please sign in to comment.