generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Problem: client/server are not yet stable APIs

Browse Source 
Solution: mark them as DRAFT APIs
This commit is contained in:
Luca Boccassi 2016-05-02 19:50:33 +01:00
parent 064cd1fbfb
commit 7e700f1e73
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.am
View File

@ -391,8 +391,6 @@ test_apps = \
tests/test_xpub_manual \ tests/test_xpub_manual \
tests/test_xpub_welcome_msg \ tests/test_xpub_welcome_msg \
tests/test_atomics \ tests/test_atomics \
tests/test_client_server \
tests/test_thread_safe \
tests/test_sockopt_hwm \ tests/test_sockopt_hwm \
tests/test_heartbeats \ tests/test_heartbeats \
tests/test_stream_exceeds_buffer \ tests/test_stream_exceeds_buffer \
@ -588,12 +586,6 @@ tests_test_xpub_welcome_msg_LDADD = src/libzmq.la
tests_test_atomics_SOURCES = tests/test_atomics.cpp tests_test_atomics_SOURCES = tests/test_atomics.cpp
tests_test_atomics_LDADD = src/libzmq.la tests_test_atomics_LDADD = src/libzmq.la
tests_test_client_server_SOURCES = tests/test_client_server.cpp
tests_test_client_server_LDADD = src/libzmq.la
tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
tests_test_thread_safe_LDADD = src/libzmq.la
tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
tests_test_sockopt_hwm_LDADD = src/libzmq.la tests_test_sockopt_hwm_LDADD = src/libzmq.la
@ -741,7 +733,14 @@ test_reqrep_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
endif endif
if ENABLE_DRAFTS if ENABLE_DRAFTS
test_apps += test_apps += tests/test_client_server \
tests/test_thread_safe
tests_test_client_server_SOURCES = tests/test_client_server.cpp
tests_test_client_server_LDADD = src/libzmq.la
tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
tests_test_thread_safe_LDADD = src/libzmq.la
endif endif
check_PROGRAMS = ${test_apps} check_PROGRAMS = ${test_apps}

6
include/zmq.h
View File

@ -260,8 +260,6 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
#define ZMQ_XPUB 9 #define ZMQ_XPUB 9
#define ZMQ_XSUB 10 #define ZMQ_XSUB 10
#define ZMQ_STREAM 11 #define ZMQ_STREAM 11
#define ZMQ_SERVER 12
#define ZMQ_CLIENT 13
#define ZMQ_RADIO 14 #define ZMQ_RADIO 14
#define ZMQ_DISH 15 #define ZMQ_DISH 15
#define ZMQ_GATHER 16 #define ZMQ_GATHER 16
@ -582,6 +580,10 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
/* DRAFT Socket types. */
#define ZMQ_SERVER 12
#define ZMQ_CLIENT 13
#endif // ZMQ_BUILD_DRAFT_API #endif // ZMQ_BUILD_DRAFT_API

4
src/precompiled.hpp
View File

@ -152,6 +152,10 @@
#ifndef ZMQ_BUILD_DRAFT_API #ifndef ZMQ_BUILD_DRAFT_API
/* DRAFT Socket types. */
#define ZMQ_SERVER 12
#define ZMQ_CLIENT 13
#endif // ZMQ_BUILD_DRAFT_API #endif // ZMQ_BUILD_DRAFT_API
#endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__ #endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__

4
tests/CMakeLists.txt
View File

@ -52,8 +52,6 @@ set(tests
test_connect_rid test_connect_rid
test_xpub_nodrop test_xpub_nodrop
test_pub_invert_matching test_pub_invert_matching
test_thread_safe
test_client_server
test_setsockopt test_setsockopt
test_sockopt_hwm test_sockopt_hwm
test_heartbeats test_heartbeats
@ -120,6 +118,8 @@ endif()
IF (ENABLE_DRAFTS) IF (ENABLE_DRAFTS)
list(APPEND tests list(APPEND tests
test_thread_safe
test_client_server
) )
ENDIF (ENABLE_DRAFTS) ENDIF (ENABLE_DRAFTS)