From 7da3ee138ea48bcdf9ee06fb0efe81612ceba5f7 Mon Sep 17 00:00:00 2001 From: Constantin Rack Date: Mon, 1 Feb 2016 11:34:36 +0100 Subject: [PATCH] Problem: deprecated `zmq_utils.h` is still included Solution: remove all remaining references to `zmq_utils.h` --- CMakeLists.txt | 3 +-- include/zmq.h | 4 ++-- packaging/redhat/zeromq.spec.in | 1 - perf/inproc_lat.cpp | 1 - perf/inproc_thr.cpp | 1 - perf/local_lat.cpp | 1 - perf/local_thr.cpp | 1 - perf/remote_lat.cpp | 1 - perf/remote_thr.cpp | 1 - src/zmq_utils.cpp | 1 - tests/test_poller.cpp | 1 - tests/test_proxy.cpp | 1 - tests/test_proxy_single_socket.cpp | 1 - tests/test_proxy_terminate.cpp | 1 - tests/test_sub_forward_tipc.cpp | 1 - tests/test_term_endpoint_tipc.cpp | 1 - tests/test_timers.cpp | 1 - 17 files changed, 3 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ba88e32..c74b5854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,8 +497,7 @@ if(MINGW) endif() include_directories(include ${CMAKE_CURRENT_BINARY_DIR}) -set(public_headers include/zmq.h - include/zmq_utils.h) +set(public_headers include/zmq.h) set(readme-docs AUTHORS COPYING diff --git a/include/zmq.h b/include/zmq.h index 0b53af67..96bbe1d4 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -28,8 +28,8 @@ ************************************************************************* NOTE to contributors. This file comprises the principal public contract - for ZeroMQ API users (along with zmq_utils.h). Any change to this file - supplied in a stable release SHOULD not break existing applications. + for ZeroMQ API users. Any change to this file supplied in a stable + release SHOULD not break existing applications. In practice this means that the value of constants must not change, and that old values may not be reused for new constants. ************************************************************************* diff --git a/packaging/redhat/zeromq.spec.in b/packaging/redhat/zeromq.spec.in index be467cf9..095a9860 100644 --- a/packaging/redhat/zeromq.spec.in +++ b/packaging/redhat/zeromq.spec.in @@ -120,7 +120,6 @@ This package contains ZeroMQ related development libraries and header files. %files devel %defattr(-,root,root,-) %{_includedir}/zmq.h -%{_includedir}/zmq_utils.h %{_libdir}/libzmq.la %{_libdir}/libzmq.a diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp index 683c9ce7..17833a02 100644 --- a/perf/inproc_lat.cpp +++ b/perf/inproc_lat.cpp @@ -28,7 +28,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp index 08fb4bf3..00feda68 100644 --- a/perf/inproc_thr.cpp +++ b/perf/inproc_thr.cpp @@ -30,7 +30,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp index ddff2083..35c84393 100644 --- a/perf/local_lat.cpp +++ b/perf/local_lat.cpp @@ -28,7 +28,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp index 9bd238dc..eb093c02 100644 --- a/perf/local_thr.cpp +++ b/perf/local_thr.cpp @@ -28,7 +28,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp index 5294f217..78a9f5f2 100644 --- a/perf/remote_lat.cpp +++ b/perf/remote_lat.cpp @@ -28,7 +28,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include #include diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp index b8594289..71764a98 100644 --- a/perf/remote_thr.cpp +++ b/perf/remote_thr.cpp @@ -28,7 +28,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include #include diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp index 6588da30..b40cc85b 100644 --- a/src/zmq_utils.cpp +++ b/src/zmq_utils.cpp @@ -36,7 +36,6 @@ #include "atomic_counter.hpp" #include "atomic_ptr.hpp" #include -#include "../include/zmq_utils.h" #if !defined ZMQ_HAVE_WINDOWS #include diff --git a/tests/test_poller.cpp b/tests/test_poller.cpp index 757ad5c9..b8f26815 100644 --- a/tests/test_poller.cpp +++ b/tests/test_poller.cpp @@ -28,7 +28,6 @@ */ #include "testutil.hpp" -#include "../include/zmq_utils.h" int main (void) { diff --git a/tests/test_proxy.cpp b/tests/test_proxy.cpp index 1753e235..8502fce3 100644 --- a/tests/test_proxy.cpp +++ b/tests/test_proxy.cpp @@ -28,7 +28,6 @@ */ #include "testutil.hpp" -#include "../include/zmq_utils.h" // Asynchronous client-to-server (DEALER to ROUTER) - pure libzmq // diff --git a/tests/test_proxy_single_socket.cpp b/tests/test_proxy_single_socket.cpp index 93770462..02fe7c05 100644 --- a/tests/test_proxy_single_socket.cpp +++ b/tests/test_proxy_single_socket.cpp @@ -28,7 +28,6 @@ */ #include "testutil.hpp" -#include "../include/zmq_utils.h" diff --git a/tests/test_proxy_terminate.cpp b/tests/test_proxy_terminate.cpp index 8d9005f8..ce494125 100644 --- a/tests/test_proxy_terminate.cpp +++ b/tests/test_proxy_terminate.cpp @@ -28,7 +28,6 @@ */ #include "testutil.hpp" -#include "../include/zmq_utils.h" // This is a test for issue #1382. The server thread creates a SUB-PUSH // steerable proxy. The main process then sends messages to the SUB diff --git a/tests/test_sub_forward_tipc.cpp b/tests/test_sub_forward_tipc.cpp index de2f7fb1..80839e8b 100644 --- a/tests/test_sub_forward_tipc.cpp +++ b/tests/test_sub_forward_tipc.cpp @@ -30,7 +30,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #undef NDEBUG diff --git a/tests/test_term_endpoint_tipc.cpp b/tests/test_term_endpoint_tipc.cpp index dc3b6d3f..9b472083 100644 --- a/tests/test_term_endpoint_tipc.cpp +++ b/tests/test_term_endpoint_tipc.cpp @@ -30,7 +30,6 @@ */ #include "../include/zmq.h" -#include "../include/zmq_utils.h" #include #include diff --git a/tests/test_timers.cpp b/tests/test_timers.cpp index 8b693920..00e31f51 100644 --- a/tests/test_timers.cpp +++ b/tests/test_timers.cpp @@ -29,7 +29,6 @@ #include "macros.hpp" #include "testutil.hpp" -#include "../include/zmq_utils.h" #if defined ZMQ_HAVE_WINDOWS #include "windows.hpp"