Skip to content

Fix deprecation warnings #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix deprecation warnings #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b1004
modified: Issue 246 Winston.jl:97 } ( -> }(
hustf Oct 18, 2015
de375fd
fix use of @compat in 57b1004b7fc40c7c2bb4ea64b4261cf6ad013ebc
mvkma Oct 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Winston.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ end
using IniFile
using Compat
using Dates

isdefined(Base, :Libc) && (strftime = Libc.strftime)
isdefined(Base, :Dates) && (datetime2unix = Dates.datetime2unix)

Expand Down Expand Up @@ -93,7 +92,7 @@ import Base: copy,
export get_context, device_to_data, data_to_device

if VERSION < v"0.3-"
typealias AbstractVecOrMat{T} (@compat Union{AbstractVector{T}, AbstractMatrix{T}})
typealias AbstractVecOrMat{T}(@compat Union{AbstractVector{T}, AbstractMatrix{T}})
extrema(x) = (minimum(x),maximum(x))
Base.push!(x, a, b) = (push!(x, a); push!(x, b))
elseif VERSION < v"0.4-"
Expand Down
2 changes: 1 addition & 1 deletion src/plot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ function fplot(f::Function, limits, args...; kvs...)
pargs = [arg]
elseif typeof(arg) <: Integer
fopts[:min_points] = arg
elseif typeof(arg) <: FloatingPoint
elseif typeof(arg) <: @compat AbstractFloat
fopts[:tol] = arg
else
error("unrecognized argument ", arg)
Expand Down
2 changes: 1 addition & 1 deletion src/renderer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ end
## state commands

color_to_rgb(i::Integer) = convert(RGB, RGB24(unsigned(i)))
color_to_rgb(s::AbstractString) = color(s)
color_to_rgb(s::AbstractString) =parse(Colorant,s)
color_to_rgb(rgb::@compat(Tuple{Real,Real,Real})) = RGB(rgb...)
color_to_rgb(cv::Color) = convert(RGB, cv)
color_to_rgb(cv::TransparentColor) = cv
Expand Down