From: Kefu Chai <kchai@redhat.com>
Date: Sun, 20 May 2018 11:54:00 +0000 (+0800)
Subject: buffer.h: avoid using c++14 features
X-Git-Tag: v14.0.0~71^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22103%2Fhead;p=ceph.git

buffer.h: avoid using c++14 features

so we dont't need to force librados client to move to C++14 or up.

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

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 606025005b0d4..f5b9094928b40 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -189,7 +189,7 @@ namespace buffer CEPH_BUFFER_API {
       const char *end_ptr;   ///< pointer to bp->end_c_str()
       const bool deep;   ///< if true, do not allow shallow ptr copies
 
-      iterator_impl(std::conditional_t<is_const, const ptr*, ptr*> p,
+      iterator_impl(typename std::conditional<is_const, const ptr*, ptr*>::type p,
 		    size_t offset, bool d)
 	: bp(p),
 	  start(p->c_str() + offset),
@@ -201,7 +201,7 @@ namespace buffer CEPH_BUFFER_API {
       friend class ptr;
 
     public:
-      using pointer = std::conditional_t<is_const, const char*, char *>;
+      using pointer = typename std::conditional<is_const, const char*, char *>::type;
       pointer get_pos_add(size_t n) {
 	auto r = pos;
 	advance(n);