wip [ci skip]

JuliaLang · Dec 18, 2017 · d20461c · d20461c
1 parent 38020f1
commit d20461c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -3320,6 +3320,9 @@ info(io::IO, err::Exception; prefix="ERROR: ", kw...) =
 info(err::Exception; prefix="ERROR: ", kw...) =
     info(STDERR, err, prefix=prefix; kw...)
 
+# issue #25082
+@deprecate_binding Void Nothing
+
 # #24844
 @deprecate copy!(dest::AbstractSet, src) union!(dest, src)
 @deprecate copy!(dest::AbstractDict, src) foldl(push!, dest, src)

diff --git a/examples/clustermanager/0mq/ZMQCM.jl b/examples/clustermanager/0mq/ZMQCM.jl
@@ -127,7 +127,7 @@ function start_broker()
     ZMQ.bind(xsub, "tcp://127.0.0.1:$(BROKER_SUB_PORT)")
     ZMQ.bind(xpub, "tcp://127.0.0.1:$(BROKER_PUB_PORT)")
 
-    ccall((:zmq_proxy, :libzmq), Cint,  (Ptr{Void}, Ptr{Void}, Ptr{Void}), xsub.data, xpub.data, C_NULL)
+    ccall((:zmq_proxy, :libzmq), Cint,  (Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}), xsub.data, xpub.data, C_NULL)
 #    proxy(xsub, xpub)
 
     # control never comes here

diff --git a/examples/embedding/embedding.c b/examples/embedding/embedding.c
@@ -142,7 +142,7 @@ int main()
                 "    nothing\n"
                 "end");
         typedef void (*Func_VOID__VOID)(void);
-        jl_value_t *pbar = jl_eval_string("cfunction(bar_from_c, Void, Tuple{})");
+        jl_value_t *pbar = jl_eval_string("cfunction(bar_from_c, Cvoid, Tuple{})");
         Func_VOID__VOID bar = (Func_VOID__VOID)jl_unbox_voidpointer(pbar);
         bar();
         checked_eval_string("bar() = println(\"calling new bar\")");