From 2b904ae2027c8d189fae660d2fac486a18760dfb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 20 May 2018 19:54:00 +0800 Subject: [PATCH] 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 --- src/include/buffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 p, + iterator_impl(typename std::conditional::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; + using pointer = typename std::conditional::type; pointer get_pos_add(size_t n) { auto r = pos; advance(n); -- 2.39.5