From 44b8e23f39e4753ba8e9b7999dd5158adaecb5dc Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <22344340+unspecd@users.noreply.github.com>
Date: Sat, 2 Jan 2021 04:09:55 -0500
Subject: Fix compilation errors when NNG_ELIDE_DEPRECATED is ON (#1392)

---
 src/tools/nngcat/nngcat.c | 8 ++++----
 src/tools/perf/pubdrop.c  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/nngcat/nngcat.c b/src/tools/nngcat/nngcat.c
index 9e106069..90a97d09 100644
--- a/src/tools/nngcat/nngcat.c
+++ b/src/tools/nngcat/nngcat.c
@@ -1105,7 +1105,7 @@ main(int ac, char **av)
 				fatal("Unable to create dialer for %s: %s",
 				    a->val, nng_strerror(rv));
 			}
-			rv = nng_dialer_getopt_ptr(
+			rv = nng_dialer_get_ptr(
 			    d, NNG_OPT_TLS_CONFIG, (void **) &tls);
 			if (rv == 0) {
 				configtls(tls);
@@ -1127,7 +1127,7 @@ main(int ac, char **av)
 				char   ustr[256];
 				size_t sz;
 				sz = sizeof(ustr);
-				if (nng_dialer_getopt(
+				if (nng_dialer_get(
 				        d, NNG_OPT_URL, ustr, &sz) == 0) {
 					printf("Connected to: %s\n", ustr);
 				}
@@ -1141,7 +1141,7 @@ main(int ac, char **av)
 				fatal("Unable to create listener for %s: %s",
 				    a->val, nng_strerror(rv));
 			}
-			rv = nng_listener_getopt_ptr(
+			rv = nng_listener_get_ptr(
 			    l, NNG_OPT_TLS_CONFIG, (void **) &tls);
 			if (rv == 0) {
 				configtls(tls);
@@ -1163,7 +1163,7 @@ main(int ac, char **av)
 				char   ustr[256];
 				size_t sz;
 				sz = sizeof(ustr);
-				if (nng_listener_getopt(
+				if (nng_listener_get(
 				        l, NNG_OPT_URL, ustr, &sz) == 0) {
 					printf("Listening at: %s\n", ustr);
 				}
diff --git a/src/tools/perf/pubdrop.c b/src/tools/perf/pubdrop.c
index be51bb2f..41ac5ba0 100644
--- a/src/tools/perf/pubdrop.c
+++ b/src/tools/perf/pubdrop.c
@@ -202,13 +202,13 @@ sub_client(void *arg)
 	if ((rv = nng_dial(sock, pa->addr, NULL, 0)) != 0) {
 		die("Cannot listen: %s", nng_strerror(rv));
 	}
-	if ((rv = nng_setopt_ms(sock, NNG_OPT_RECONNMINT, 51)) != 0) {
+	if ((rv = nng_socket_set_ms(sock, NNG_OPT_RECONNMINT, 51)) != 0) {
 		die("setopt: %s", nng_strerror(rv));
 	}
-	if ((rv = nng_setopt(sock, NNG_OPT_SUB_SUBSCRIBE, "", 0)) != 0) {
+	if ((rv = nng_socket_set(sock, NNG_OPT_SUB_SUBSCRIBE, "", 0)) != 0) {
 		die("setopt: %s", nng_strerror(rv));
 	}
-	if ((rv = nng_setopt_ms(sock, NNG_OPT_RECVTIMEO, 10000)) != 0) {
+	if ((rv = nng_socket_set_ms(sock, NNG_OPT_RECVTIMEO, 10000)) != 0) {
 		die("setopt: %s", nng_strerror(rv));
 	}
 
-- 
cgit v1.2.3-70-g09d2