From 6de24c190a11444ebd55e7b83dc9831732823b8d Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 2 May 2016 20:00:00 +0100
Subject: [PATCH] Problem: scatter/gather are not yet stable APIs

Solution: mark them as DRAFT APIs
---
 Makefile.am          | 10 +++++-----
 include/zmq.h        |  4 ++--
 src/precompiled.hpp  |  2 ++
 tests/CMakeLists.txt |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 73cdc586..8e898eef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -394,7 +394,6 @@ test_apps = \
 	tests/test_sockopt_hwm \
 	tests/test_heartbeats \
 	tests/test_stream_exceeds_buffer \
-	tests/test_scatter_gather \
 	tests/test_pub_invert_matching
 
 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_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_LDADD = src/libzmq.la
 
@@ -722,7 +718,8 @@ test_apps += tests/test_poller \
 	tests/test_thread_safe \
 	tests/test_timers \
 	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_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_LDADD = src/libzmq.la
+
+tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
+tests_test_scatter_gather_LDADD = src/libzmq.la
 endif
 
 check_PROGRAMS = ${test_apps}
diff --git a/include/zmq.h b/include/zmq.h
index fe0eed1d..54adcaca 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -260,8 +260,6 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
 #define ZMQ_XPUB 9
 #define ZMQ_XSUB 10
 #define ZMQ_STREAM 11
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
 
 /*  Deprecated aliases                                                        */
 #define ZMQ_XREQ ZMQ_DEALER
@@ -529,6 +527,8 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 #define ZMQ_CLIENT 13
 #define ZMQ_RADIO 14
 #define ZMQ_DISH 15
+#define ZMQ_GATHER 16
+#define ZMQ_SCATTER 17
 
 /*  DRAFT Socket events.                                                      */
 ZMQ_EXPORT int zmq_join (void *s, const char *group);
diff --git a/src/precompiled.hpp b/src/precompiled.hpp
index afd591c0..e90a8f7d 100644
--- a/src/precompiled.hpp
+++ b/src/precompiled.hpp
@@ -157,6 +157,8 @@
 #define ZMQ_CLIENT 13
 #define ZMQ_RADIO 14
 #define ZMQ_DISH 15
+#define ZMQ_GATHER 16
+#define ZMQ_SCATTER 17
 
 /*  DRAFT Socket events.                                                      */
 int zmq_join (void *s, const char *group);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fa76bf5c..1b1b523d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -64,7 +64,6 @@ set(tests
         test_stream_timeout
         test_xpub_manual
         test_xpub_welcome_msg
-        test_scatter_gather
 )
 if(NOT WIN32)
   list(APPEND tests
@@ -120,6 +119,7 @@ IF (ENABLE_DRAFTS)
         test_timers
         test_radio_dish
         test_udp
+        test_scatter_gather
     )
 ENDIF (ENABLE_DRAFTS)