Merge branch 'master' of github.com:felixguendling/cista

felixguendling · Apr 11, 2024 · 715692f · 715692f
2 parents 95b2779 + 5f93560
commit 715692f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/include/cista/containers/hash_storage.h b/include/cista/containers/hash_storage.h
@@ -292,8 +292,8 @@ struct hash_storage {
   }
 
   hash_storage& operator=(hash_storage const& other) {
+    clear();
     if (other.size() == 0U) {
-      clear();
       return *this;
     }
     for (const auto& v : other) {

diff --git a/include/cista/containers/variant.h b/include/cista/containers/variant.h
@@ -438,6 +438,11 @@ using cista::variant;
 
 namespace std {
 
+template <typename Visitor, typename... T>
+constexpr auto visit(Visitor&& vis, cista::variant<T...>&& v) {
+  v.apply(vis);
+}
+
 using cista::get;
 
 }  // namespace std
diff --git a/test/variant_test.cc b/test/variant_test.cc
@@ -241,3 +241,15 @@ TEST_CASE("variant get_if") {
   REQUIRE(str != nullptr);
   CHECK(*str == "hello test test test test");
 }
+
+TEST_CASE("std visit") {
+  std::visit(
+      [](auto&& x) {
+        if constexpr (std::is_same_v<int, std::decay_t<decltype(x)>>) {
+          CHECK(true);
+        } else {
+          CHECK(false);
+        }
+      },
+      cista::variant<int, float>{1});
+}