Skip to content

Commit a026314

Browse files
authored
Merge pull request #184 from JuliaGizmos/fbot/deps
Fix deprecations
2 parents 0a8d232 + 305cf34 commit a026314

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/core.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,6 @@ struct MaybeMessage
233233
end
234234

235235
Base.get(x::MaybeMessage) = isnull(x) ? throw(NullException()) : x.data
236-
if VERSION < v"0.7.0-alpha.2"
237-
import Base: isnull
238-
end
239236
isnull(x::MaybeMessage) = x.isnull
240237
Base.convert(::Type{MaybeMessage}, x::Message) = MaybeMessage(x)
241238

src/time.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ end
5454
# Aggregate a signal producing an update at most once in dt seconds
5555
function throttle_connect(dt, output, input, f, init, reinit, leading, debounce)
5656
collected = init
57-
timer = Timer(identity, 0) #dummy timer to initialise
57+
timer = Timer(identity, interval=0) #dummy timer to initialise
5858
dopush(_) = begin
5959
push!(output, collected)
6060
collected = reinit(collected)
@@ -75,7 +75,7 @@ function throttle_connect(dt, output, input, f, init, reinit, leading, debounce)
7575
# prevpush is reset in dopush, so that calls via the Timer also reset it
7676
dopush(elapsed)
7777
else
78-
timer = Timer(dopush, dt-elapsed)
78+
timer = Timer(dopush, interval=dt-elapsed)
7979
end
8080
nothing
8181
end
@@ -122,15 +122,15 @@ function setup_next_tick(outputref, switchref, dt, wait_dt)
122122
if value(switchref.value)
123123
push!(outputref.value, dt)
124124
end
125-
end, wait_dt)
125+
end, interval=wait_dt)
126126
end
127127

128128
function fpswhen_connect(rate, switch, output, name)
129129
prev_time = time()
130130
dt = 1.0/rate
131131
outputref = WeakRef(output)
132132
switchref = WeakRef(switch)
133-
timer = Timer(identity, 0) # dummy timer to initialise
133+
timer = Timer(identity, interval=0) # dummy timer to initialise
134134
function fpswhen_runner()
135135
# this function will run if switch gets a new value (i.e. is "active")
136136
# and if output is pushed to (assumed to be by the timer)

0 commit comments

Comments
 (0)