Rebased

man-group · Mar 21, 2024 · c1076a4 · c1076a4
1 parent a84fc8f
commit c1076a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/include/sparrow/array_data.hpp b/include/sparrow/array_data.hpp
@@ -116,11 +116,11 @@ namespace sparrow
  using base_type = reference_proxy_base<self_type>;
  using layout_type = L;
  using value_type = typename L::inner_value_type;
- using reference = typename L::inner_const_reference;
+ using const_reference = typename L::inner_const_reference;
  using bitmap_reference = typename L::bitmap_const_reference;
  using size_type = typename L::size_type;
 
- const_reference_proxy(reference val_ref, bitmap_reference bit_ref);
+ const_reference_proxy(const_reference val_ref, bitmap_reference bit_ref);
  ~const_reference_proxy() = default;
 
  const_reference_proxy(const self_type&) = default;
@@ -129,11 +129,11 @@ namespace sparrow
  bool has_value() const;
  explicit operator bool() const;
 
- const value_type& value() const;
+ const_reference value() const;
 
  private:
 
- reference m_val_ref;
+ const_reference m_val_ref;
  bitmap_reference m_bit_ref;
  };
 
@@ -259,7 +259,7 @@ namespace sparrow
  ****************************************/
 
  template <class L>
- const_reference_proxy<L>::const_reference_proxy(reference val_ref, bitmap_reference bit_ref)
+ const_reference_proxy<L>::const_reference_proxy(const_reference val_ref, bitmap_reference bit_ref)
  : m_val_ref(val_ref)
  , m_bit_ref(bit_ref)
  {
@@ -278,7 +278,7 @@ namespace sparrow
  }
 
  template <class L>
- auto const_reference_proxy<L>::value() const -> const value_type&
+ auto const_reference_proxy<L>::value() const -> const_reference
  {
  assert(has_value());
  return m_val_ref;

diff --git a/include/sparrow/variable_size_binary_layout.hpp b/include/sparrow/variable_size_binary_layout.hpp
@@ -131,6 +131,8 @@ namespace sparrow
  using inner_value_type = T;
  using inner_reference = R;
  using inner_const_reference = CR;
+ using bitmap_type = array_data::bitmap_type;
+ using bitmap_const_reference = typename bitmap_type::const_reference;
  using value_type = std::optional<inner_value_type>;
  using const_reference = const_reference_proxy<self_type>;
  using size_type = std::size_t;
@@ -248,7 +250,7 @@ namespace sparrow
  template <class T, class R, class CR, class OT>
  auto variable_size_binary_layout<T, R, CR, OT>::operator[](size_type i) const -> const_reference
  {
- return const_reference(*this, i);
+ return const_reference(value(i), has_value(i));
  }
 
  template <class T, class R, class CR, class OT>