f

martinus · Dec 14, 2023 · 4611c37 · 4611c37
1 parent 250ec0f
commit 4611c37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/include/ankerl/unordered_dense.h b/include/ankerl/unordered_dense.h
@@ -893,7 +893,9 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
 
     // assumes m_values has data, m_buckets=m_buckets_end=nullptr, m_shifts is INITIAL_SHIFTS
     void copy_buckets(table const& other) {
+        // assumes m_values has already the correct data copied over.
         if (empty()) {
+            // when empty, at least allocate an initial buckets and clear them.
             allocate_buckets_from_shift();
             clear_buckets();
         } else {

diff --git a/test/bench/game_of_life.cpp b/test/bench/game_of_life.cpp
@@ -9,16 +9,20 @@
 #include <vector>
 
 #if __has_include("boost/unordered/unordered_flat_map.hpp")
-#    pragma clang diagnostic ignored "-Wold-style-cast"
+#    if defined(__clang__)
+#        pragma clang diagnostic ignored "-Wold-style-cast"
+#    endif
 #    include "boost/unordered/unordered_flat_map.hpp"
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 0 // NOLINT(cppcoreguidelines-macro-usage)
 #endif
 
 #if 0 && __has_include("absl/container/flat_hash_map.h")
-#    pragma clang diagnostic ignored "-Wdeprecated-builtins"
-#    pragma clang diagnostic ignored "-Wsign-conversion"
+#    if defined(__clang__)
+#        pragma clang diagnostic ignored "-Wdeprecated-builtins"
+#        pragma clang diagnostic ignored "-Wsign-conversion"
+#    endif
 #    include <absl/container/flat_hash_map.h>
 #    define HAS_ABSL() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else

diff --git a/test/bench/show_allocations.cpp b/test/bench/show_allocations.cpp
@@ -6,8 +6,10 @@
 #include <third-party/nanobench.h>
 
 #if __has_include("boost/unordered/unordered_flat_map.hpp")
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wold-style-cast"
+#    if defined(__clang__)
+#        pragma clang diagnostic push
+#        pragma clang diagnostic ignored "-Wold-style-cast"
+#    endif
 #    include "boost/unordered/unordered_flat_map.hpp"
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else

diff --git a/test/meson.build b/test/meson.build
@@ -88,6 +88,7 @@ foreach arg : [
             '-Wno-stringop-overflow', # g++ error in fmtlib
             '-Warith-conversion',
             '-Wshadow=global',
+            '-Wno-array-bounds', # gcc 13 gives incorrect warning
 
             # gcc / clang
             '-Wconversion',