From 0d171563d0b6a0bbb3062610b460f2e92acc5795 Mon Sep 17 00:00:00 2001 From: Constantin Rack Date: Mon, 1 Feb 2016 21:40:24 +0100 Subject: [PATCH] Problem: tests use deprecated `zmq_term` function Solution: replace all occurrences with `zmq_ctx_term` --- tests/test_conflate.cpp | 2 +- tests/test_connect_delay_tipc.cpp | 6 +++--- tests/test_fork.cpp | 2 +- tests/test_pair_tipc.cpp | 2 +- tests/test_reqrep_device_tipc.cpp | 2 +- tests/test_reqrep_tipc.cpp | 2 +- tests/test_router_mandatory_tipc.cpp | 2 +- tests/test_shutdown_stress_tipc.cpp | 2 +- tests/test_sub_forward_tipc.cpp | 2 +- tests/test_term_endpoint_tipc.cpp | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/test_conflate.cpp b/tests/test_conflate.cpp index 9155695a..5e13a948 100644 --- a/tests/test_conflate.cpp +++ b/tests/test_conflate.cpp @@ -75,7 +75,7 @@ int main (int, char *[]) rc = zmq_close (s_out); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0; diff --git a/tests/test_connect_delay_tipc.cpp b/tests/test_connect_delay_tipc.cpp index 8a47bed9..1062aba3 100644 --- a/tests/test_connect_delay_tipc.cpp +++ b/tests/test_connect_delay_tipc.cpp @@ -104,7 +104,7 @@ int main (void) rc = zmq_close (to); assert (rc == 0); - rc = zmq_term (context); + rc = zmq_ctx_term (context); assert (rc == 0); // TEST 2 @@ -169,7 +169,7 @@ int main (void) rc = zmq_close (to); assert (rc == 0); - rc = zmq_term (context); + rc = zmq_ctx_term (context); assert (rc == 0); // TEST 3 @@ -242,7 +242,7 @@ int main (void) rc = zmq_close (frontend); assert (rc == 0); - rc = zmq_term (context); + rc = zmq_ctx_term (context); assert (rc == 0); } diff --git a/tests/test_fork.cpp b/tests/test_fork.cpp index e8678af7..973e2907 100644 --- a/tests/test_fork.cpp +++ b/tests/test_fork.cpp @@ -50,7 +50,7 @@ int main (void) // Child process // Immediately close parent sockets and context zmq_close (pull); - zmq_term (ctx); + zmq_ctx_term (ctx); // Create new context, socket, connect and send some messages void *child_ctx = zmq_ctx_new (); diff --git a/tests/test_pair_tipc.cpp b/tests/test_pair_tipc.cpp index 1b284add..2766b232 100644 --- a/tests/test_pair_tipc.cpp +++ b/tests/test_pair_tipc.cpp @@ -57,7 +57,7 @@ int main (void) rc = zmq_close (sb); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0 ; diff --git a/tests/test_reqrep_device_tipc.cpp b/tests/test_reqrep_device_tipc.cpp index b617f8ac..e1154214 100644 --- a/tests/test_reqrep_device_tipc.cpp +++ b/tests/test_reqrep_device_tipc.cpp @@ -146,7 +146,7 @@ int main (void) assert (rc == 0); rc = zmq_close (dealer); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0 ; diff --git a/tests/test_reqrep_tipc.cpp b/tests/test_reqrep_tipc.cpp index bd0e4116..7099a4e9 100644 --- a/tests/test_reqrep_tipc.cpp +++ b/tests/test_reqrep_tipc.cpp @@ -57,7 +57,7 @@ int main (void) rc = zmq_close (sb); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0 ; diff --git a/tests/test_router_mandatory_tipc.cpp b/tests/test_router_mandatory_tipc.cpp index ca961790..da5e33fb 100644 --- a/tests/test_router_mandatory_tipc.cpp +++ b/tests/test_router_mandatory_tipc.cpp @@ -65,7 +65,7 @@ int main (void) rc = zmq_close (sa); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0 ; diff --git a/tests/test_shutdown_stress_tipc.cpp b/tests/test_shutdown_stress_tipc.cpp index ac8e72b3..5c52d014 100644 --- a/tests/test_shutdown_stress_tipc.cpp +++ b/tests/test_shutdown_stress_tipc.cpp @@ -95,7 +95,7 @@ int main (void) rc = zmq_close (s1); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); } diff --git a/tests/test_sub_forward_tipc.cpp b/tests/test_sub_forward_tipc.cpp index 80839e8b..4d98c54a 100644 --- a/tests/test_sub_forward_tipc.cpp +++ b/tests/test_sub_forward_tipc.cpp @@ -103,7 +103,7 @@ int main (void) assert (rc == 0); rc = zmq_close (sub); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0 ; diff --git a/tests/test_term_endpoint_tipc.cpp b/tests/test_term_endpoint_tipc.cpp index 9b472083..949a1d14 100644 --- a/tests/test_term_endpoint_tipc.cpp +++ b/tests/test_term_endpoint_tipc.cpp @@ -81,7 +81,7 @@ int main (void) assert (rc == 0); rc = zmq_close (push); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); @@ -122,7 +122,7 @@ int main (void) assert (rc == 0); rc = zmq_close (push); assert (rc == 0); - rc = zmq_term (ctx); + rc = zmq_ctx_term (ctx); assert (rc == 0); return 0;