Skip to content

Commit dcff65e

Browse files
committed
Relax Function type constraint on callback objects
1 parent dc9f241 commit dcff65e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/pubsub.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ end
1919

2020
type Subscriber{MsgType<:MsgT}
2121
o::PyObject
22-
callback::Function
22+
callback
2323

2424
function Subscriber(
25-
topic::String, cb::Function, cb_args = (); kwargs...
25+
topic::String, cb, cb_args::Tuple=(); kwargs...
2626
)
2727
@debug("Creating <$(string(MsgType))> subscriber on topic: '$topic'")
2828
rospycls = _get_rospy_class(MsgType)
@@ -36,7 +36,7 @@ end
3636
Subscriber{MsgType<:MsgT}(
3737
topic::String,
3838
::Type{MsgType},
39-
cb::Function,
40-
cb_args = ();
39+
cb,
40+
cb_args::Tuple=();
4141
kwargs...
4242
) = Subscriber{MsgType}(topic, cb, cb_args; kwargs...)

src/services.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ end
3939

4040
type Service{SrvType <: ServiceDefinition}
4141
o::PyObject
42-
jl_handler::Function
42+
jl_handler
4343

44-
function Service(name::String, handler::Function; kwargs...)
44+
function Service(name::String, handler; kwargs...)
4545
@debug("Providing <$SrvType> service at '$name'")
4646
rospycls = _get_rospy_class(SrvType)
4747
ReqType = _srv_reqtype(SrvType)
@@ -63,7 +63,7 @@ end
6363
function Service{SrvType<:ServiceDefinition}(
6464
name::String,
6565
srv::Type{SrvType},
66-
handler::Function;
66+
handler;
6767
kwargs...
6868
)
6969
Service{SrvType}(name, handler; kwargs...)

0 commit comments

Comments
 (0)