From e6d52b95680795d92280474fb6c28619c1aebc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaim=20=28Jo=C3=ABl=20Lamotte=29?=
 <142265+Klaim@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:30:35 +0200
Subject: [PATCH] fixed rebasing issue

---
 include/sparrow/data_type.hpp                   | 16 ++++++++++++++++
 include/sparrow/mp_utils.hpp                    | 13 -------------
 include/sparrow/variable_size_binary_layout.hpp | 10 +++++-----
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/include/sparrow/data_type.hpp b/include/sparrow/data_type.hpp
index 4a38cfb7..b1676cf3 100644
--- a/include/sparrow/data_type.hpp
+++ b/include/sparrow/data_type.hpp
@@ -209,6 +209,22 @@ namespace sparrow
     };
 
 
+    namespace impl
+    {
+        template <class C, bool is_const>
+        struct get_inner_reference
+            : std::conditional<is_const, typename C::inner_const_reference, typename C::inner_reference>
+        {
+        };
+
+        template <class C, bool is_const>
+        using get_inner_reference_t = typename get_inner_reference<C, is_const>::type;
+    }  // namespace impl
+
+    template <class T>
+    concept layout_offset = std::same_as<T, std::int32_t> || std::same_as<T, std::int64_t>;
+
+
 
 }
 
diff --git a/include/sparrow/mp_utils.hpp b/include/sparrow/mp_utils.hpp
index b9dcfe08..8c19cc7b 100644
--- a/include/sparrow/mp_utils.hpp
+++ b/include/sparrow/mp_utils.hpp
@@ -265,18 +265,5 @@ namespace sparrow::mpl
     }
 
 
-    namespace impl
-    {
-        template <class C, bool is_const>
-        struct get_inner_reference
-            : std::conditional<is_const, typename C::inner_const_reference, typename C::inner_reference>
-        {
-        };
-
-        template <class C, bool is_const>
-        using get_inner_reference_t = typename get_inner_reference<C, is_const>::type;
-    }  // namespace impl
 
-    template <class T>
-    concept layout_offset = std::same_as<T, std::int32_t> || std::same_as<T, std::int64_t>;
 }
diff --git a/include/sparrow/variable_size_binary_layout.hpp b/include/sparrow/variable_size_binary_layout.hpp
index 29b6b7a7..29e904a2 100644
--- a/include/sparrow/variable_size_binary_layout.hpp
+++ b/include/sparrow/variable_size_binary_layout.hpp
@@ -52,7 +52,7 @@ namespace sparrow
         >;
         using reference = typename base_type::reference;
         using difference_type = typename base_type::difference_type;
-        
+
         using offset_iterator = std::conditional_t<
             is_const, typename L::const_offset_iterator, typename L::offset_iterator
         >;
@@ -99,7 +99,7 @@ namespace sparrow
      * The internal buffers will be:
      * - offset: [0, 6, 11, 13, 15, 24, 30]
      * - data: ['p','l','e','a','s','e','a','l','l','o','w','m','e','t','o','i','n','t','r','o','d','u','c','e','m','y','s','e','l','f']
-     * 
+     *
      * @tparam T the type of the data stored in the data buffer, not its byte representation.
      * @tparam R the reference type to the data. This type is different from the reference type of the layout,
      * which behaves like std::optional<R>.
@@ -133,7 +133,7 @@ namespace sparrow
         using const_offset_iterator = const OT*;
         using data_iterator = data_type*;
         using const_data_iterator = const data_type*;
-        
+
         using const_value_iterator = vs_binary_value_iterator<self_type, true>;
         using const_bitmap_iterator = array_data::bitmap_type::const_iterator;
         using const_iterator = layout_iterator<self_type, true>;
@@ -264,7 +264,7 @@ namespace sparrow
         assert(i < size());
         return const_reference(value(i), has_value(i));
     }
-    
+
     template <class T, class R, class CR, layout_offset OT>
     auto variable_size_binary_layout<T, R, CR, OT>::cbegin() const -> const_iterator
     {
@@ -276,7 +276,7 @@ namespace sparrow
     {
         return const_iterator(value_cend(), bitmap_cend());
     }
-    
+
     template <class T, class R, class CR, layout_offset OT>
     auto variable_size_binary_layout<T, R, CR, OT>::bitmap() const -> const_bitmap_range
     {