From: Kefu Chai <kchai@redhat.com>
Date: Wed, 5 Dec 2018 12:56:53 +0000 (+0800)
Subject: buffer: mark the iterator traits "public"
X-Git-Tag: v14.1.0~711^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5c708ece392313f63ef772d151c1e1f12872efa1;p=ceph.git

buffer: mark the iterator traits "public"

the iterator traits should be accessible from non-dervative classes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 56c5e8154e286..112fdc96dac2e 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -687,12 +687,6 @@ namespace buffer CEPH_BUFFER_API {
       typedef typename std::conditional<is_const,
 					typename buffers_t::const_iterator,
 					typename buffers_t::iterator>::type list_iter_t;
-      using iterator_category = std::forward_iterator_tag;
-      using value_type = typename std::conditional<is_const, const char, char>::type;
-      using difference_type = std::ptrdiff_t;
-      using pointer = typename std::add_pointer<value_type>::type;
-      using reference = typename std::add_lvalue_reference<value_type>::type;
-
       bl_t* bl;
       list_t* ls;  // meh.. just here to avoid an extra pointer dereference..
       list_iter_t p;
@@ -701,6 +695,12 @@ namespace buffer CEPH_BUFFER_API {
       friend class iterator_impl<true>;
 
     public:
+      using iterator_category = std::forward_iterator_tag;
+      using value_type = typename std::conditional<is_const, const char, char>::type;
+      using difference_type = std::ptrdiff_t;
+      using pointer = typename std::add_pointer<value_type>::type;
+      using reference = typename std::add_lvalue_reference<value_type>::type;
+
       // constructor.  position.
       iterator_impl()
 	: bl(0), ls(0), off(0), p_off(0) {}