generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-07 14:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Problem: scatter/gather are not yet stable APIs

Browse Source 
Solution: mark them as DRAFT APIs
This commit is contained in:
Luca Boccassi 2016-05-02 20:00:00 +01:00
parent caaf66c32c
commit 6de24c190a
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -394,7 +394,6 @@ test_apps = \
tests/test_sockopt_hwm \ tests/test_sockopt_hwm \
tests/test_heartbeats \ tests/test_heartbeats \
tests/test_stream_exceeds_buffer \ tests/test_stream_exceeds_buffer \
tests/test_scatter_gather \
tests/test_pub_invert_matching tests/test_pub_invert_matching
tests_test_system_SOURCES = tests/test_system.cpp tests_test_system_SOURCES = tests/test_system.cpp
@ -594,9 +593,6 @@ tests_test_heartbeats_LDADD = src/libzmq.la
tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp
tests_test_stream_exceeds_buffer_LDADD = src/libzmq.la tests_test_stream_exceeds_buffer_LDADD = src/libzmq.la
tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
tests_test_scatter_gather_LDADD = src/libzmq.la
tests_test_pub_invert_matching_SOURCES = tests/test_pub_invert_matching.cpp tests_test_pub_invert_matching_SOURCES = tests/test_pub_invert_matching.cpp
tests_test_pub_invert_matching_LDADD = src/libzmq.la tests_test_pub_invert_matching_LDADD = src/libzmq.la
@ -722,7 +718,8 @@ test_apps += tests/test_poller \
tests/test_thread_safe \ tests/test_thread_safe \
tests/test_timers \ tests/test_timers \
tests/test_radio_dish \ tests/test_radio_dish \
tests/test_udp tests/test_udp \
tests/test_scatter_gather
tests_test_poller_SOURCES = tests/test_poller.cpp tests_test_poller_SOURCES = tests/test_poller.cpp
tests_test_poller_LDADD = src/libzmq.la tests_test_poller_LDADD = src/libzmq.la
@ -741,6 +738,9 @@ tests_test_radio_dish_LDADD = src/libzmq.la
tests_test_udp_SOURCES = tests/test_udp.cpp tests_test_udp_SOURCES = tests/test_udp.cpp
tests_test_udp_LDADD = src/libzmq.la tests_test_udp_LDADD = src/libzmq.la
tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
tests_test_scatter_gather_LDADD = src/libzmq.la
endif endif
check_PROGRAMS = ${test_apps} check_PROGRAMS = ${test_apps}

4
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_GATHER 16
#define ZMQ_SCATTER 17
/* Deprecated aliases */ /* Deprecated aliases */
#define ZMQ_XREQ ZMQ_DEALER #define ZMQ_XREQ ZMQ_DEALER
@ -529,6 +527,8 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
#define ZMQ_CLIENT 13 #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_SCATTER 17
/* DRAFT Socket events. */ /* DRAFT Socket events. */
ZMQ_EXPORT int zmq_join (void *s, const char *group); ZMQ_EXPORT int zmq_join (void *s, const char *group);

2
src/precompiled.hpp
View File

@ -157,6 +157,8 @@
#define ZMQ_CLIENT 13 #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_SCATTER 17
/* DRAFT Socket events. */ /* DRAFT Socket events. */
int zmq_join (void *s, const char *group); int zmq_join (void *s, const char *group);

2
tests/CMakeLists.txt
View File

@ -64,7 +64,6 @@ set(tests
test_stream_timeout test_stream_timeout
test_xpub_manual test_xpub_manual
test_xpub_welcome_msg test_xpub_welcome_msg
test_scatter_gather
) )
if(NOT WIN32) if(NOT WIN32)
list(APPEND tests list(APPEND tests
@ -120,6 +119,7 @@ IF (ENABLE_DRAFTS)
test_timers test_timers
test_radio_dish test_radio_dish
test_udp test_udp
test_scatter_gather
) )
ENDIF (ENABLE_DRAFTS) ENDIF (ENABLE_DRAFTS)