From 7b8c3e5792f0aee13a84275df74a6adfd7876fb5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 19 Jun 2020 19:29:28 +0800 Subject: [PATCH] crimson/common: make FixedKVNodeLayout::set_val() public otherwise clang++ fails with ``` mson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc:183:10: error: 'set_val' is a private member of 'crimson::common::FixedKVNodeLayout<255, unsigned long, ceph_le, crimson::os::seastore::paddr_t, crimson::os::seastore::paddr_le_t, true>::iter_t' i->set_val(updated); ^ /home/jenkins-build/build/workspace/ceph-perf-crimson/ceph-master/src/crimson/common/fixed_kv_node_layout.h:148:10: note: declared private here void set_val(V val) const { ^ ``` Signed-off-by: Kefu Chai --- src/crimson/common/fixed_kv_node_layout.h | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/crimson/common/fixed_kv_node_layout.h b/src/crimson/common/fixed_kv_node_layout.h index 422e47553586..4fda9dd93909 100644 --- a/src/crimson/common/fixed_kv_node_layout.h +++ b/src/crimson/common/fixed_kv_node_layout.h @@ -125,6 +125,11 @@ public: return next->get_key(); } + void set_val(V val) const { + static_assert(!is_const); + node->get_val_ptr()[offset] = VINT(val); + } + V get_val() const { return V(node->get_val_ptr()[offset]); }; @@ -145,11 +150,6 @@ public: node->get_key_ptr()[offset] = lb; } - void set_val(V val) const { - static_assert(!is_const); - node->get_val_ptr()[offset] = VINT(val); - } - typename maybe_const_t::type get_key_ptr() const { return reinterpret_cast< typename maybe_const_t::type>( @@ -401,6 +401,15 @@ public: return *layout.template Pointer<0>(buf); } + /** + * set_size + * + * Set size representation to match size + */ + void set_size(uint16_t size) { + *layout.template Pointer<0>(buf) = size; + } + constexpr static size_t get_capacity() { return CAPACITY; } @@ -604,16 +613,6 @@ private: return layout.template Pointer<2>(buf); } - /** - * set_size - * - * Set size representation to match size - */ - void set_size(uint16_t size) { - *layout.template Pointer<0>(buf) = size; - } - - /** * copy_from_foreign * -- 2.47.3