NO-JIRA - Generalized the generation of iovectors from field iterators.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1484576 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 2 deletions

diff --git a/qpid/extras/dispatch/include/qpid/dispatch/iterator.h b/qpid/extras/dispatch/include/qpid/dispatch/iterator.h
index be10990f40..2412995432 100644
--- a/qpid/extras/dispatch/include/qpid/dispatch/iterator.h
+++ b/qpid/extras/dispatch/include/qpid/dispatch/iterator.h
@@ -20,6 +20,7 @@
  */
 
 #include <qpid/dispatch/buffer.h>
+#include <qpid/dispatch/iovec.h>
 
 /**
  * The field iterator is used to access fields within a buffer chain.
@@ -149,6 +150,7 @@ int dx_field_iterator_prefix(dx_field_iterator_t *iter, const char *prefix);
 unsigned char *dx_field_iterator_copy(dx_field_iterator_t *iter);
 
 
+dx_iovec_t *dx_field_iterator_iovec(const dx_field_iterator_t *iter);
 
 typedef struct dx_field_map_t dx_field_map_t;
 
diff --git a/qpid/extras/dispatch/include/qpid/dispatch/message.h b/qpid/extras/dispatch/include/qpid/dispatch/message.h
index 8311f846d6..c725deb923 100644
--- a/qpid/extras/dispatch/include/qpid/dispatch/message.h
+++ b/qpid/extras/dispatch/include/qpid/dispatch/message.h
@@ -24,7 +24,6 @@
 #include <qpid/dispatch/alloc.h>
 #include <qpid/dispatch/iterator.h>
 #include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/iovec.h>
 
 // Callback for status change (confirmed persistent, loaded-in-memory, etc.)
 
@@ -110,7 +109,6 @@ void dx_message_send(dx_message_t *msg, pn_link_t *link);
 
 int dx_message_check(dx_message_t *msg, dx_message_depth_t depth);
 dx_field_iterator_t *dx_message_field_iterator(dx_message_t *msg, dx_message_field_t field);
-dx_iovec_t *dx_message_field_iovec(dx_message_t *msg, dx_message_field_t field);
 
 ssize_t dx_message_field_length(dx_message_t *msg, dx_message_field_t field);
 ssize_t dx_message_field_copy(dx_message_t *msg, dx_message_field_t field, void *buffer);