macos: vecvec bucket <-> std::span compatibility (#182)

felixguendling · May 31, 2023 · 8c090ea · 8c090ea
1 parent 9e39a20
commit 8c090ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,7 @@ include(GNUInstallDirs)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
     "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
   set(cista-compile-flags
+     -Wno-unknown-warning-option
      -Wno-global-constructors
      -Wno-exit-time-destructors
      -fno-strict-aliasing

diff --git a/include/cista/containers/vecvec.h b/include/cista/containers/vecvec.h
@@ -28,6 +28,8 @@ struct basic_vecvec {
     bucket(basic_vecvec* map, index_value_type const i)
         : map_{map}, i_{to_idx(i)} {}
 
+    data_value_type* data() const { return &(*begin()); }
+
     template <typename T = std::decay_t<data_value_type>,
               typename = std::enable_if_t<std::is_same_v<T, char>>>
     std::string_view view() const {
@@ -75,9 +77,7 @@ struct basic_vecvec {
       return *(begin() + i);
     }
 
-    index_value_type size() const {
-      return bucket_end_idx() - bucket_begin_idx();
-    }
+    std::size_t size() const { return bucket_end_idx() - bucket_begin_idx(); }
     iterator begin() { return map_->data_.begin() + bucket_begin_idx(); }
     iterator end() { return map_->data_.begin() + bucket_end_idx(); }
     const_iterator begin() const {
@@ -159,6 +159,9 @@ struct basic_vecvec {
     const_bucket(basic_vecvec const* map, index_value_type const i)
         : map_{map}, i_{to_idx(i)} {}
 
+    friend iterator data(const_bucket const& b) { return b.begin(); }
+    friend std::size_t size(const_bucket const& b) { return b.size(); }
+
     template <typename T = std::decay_t<data_value_type>,
               typename = std::enable_if_t<std::is_same_v<T, char>>>
     std::string_view view() const {

diff --git a/test/comparable_test.cc b/test/comparable_test.cc
@@ -9,7 +9,7 @@
 #endif
 
 struct comparable_a {
-  CISTA_COMPARABLE()
+  CISTA_FRIEND_COMPARABLE(comparable_a)
   int i_ = 1;
   int j_ = 2;
   double d_ = 100.0;