Merge branch 'felixguendling:master' into master

felixguendling · Oct 31, 2024 · 35b9902 · 35b9902
2 parents 347f524 + 5b6808f
commit 35b9902
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/include/cista/buffer.h b/include/cista/buffer.h
@@ -32,9 +32,19 @@ struct buffer final {
   buffer(buffer const&) = delete;
   buffer& operator=(buffer const&) = delete;
 
-  buffer(buffer&& o) noexcept : buf_(o.buf_), size_(o.size_) { o.reset(); }
+  buffer(buffer&& o) noexcept : buf_(o.buf_), size_(o.size_) {
+    if (&o != this) {
+      o.reset();
+    }
+  }
 
   buffer& operator=(buffer&& o) noexcept {
+    if (&o == this) {
+      return *this;
+    }
+    if (buf_ != nullptr) {
+      std::free(buf_);
+    }
     buf_ = o.buf_;
     size_ = o.size_;
     o.reset();

diff --git a/include/cista/hashing.h b/include/cista/hashing.h
@@ -142,6 +142,14 @@ struct hashing<std::chrono::duration<Rep, Period>> {
   }
 };
 
+template <typename Clock, typename Duration>
+struct hashing<std::chrono::time_point<Clock, Duration>> {
+  hash_t operator()(std::chrono::time_point<Clock, Duration> const& el,
+                    hash_t const seed = BASE_HASH) {
+    return hashing<Duration>{}(el.time_since_epoch(), seed);
+  }
+};
+
 template <typename T1, typename T2>
 struct hashing<std::pair<T1, T2>> {
   constexpr hash_t operator()(std::pair<T1, T2> const& el,
@@ -171,7 +179,7 @@ struct hashing<std::tuple<Args...>> {
     hash_t h = seed;
     std::apply(
         [&h](auto&&... args) {
-          ((h = hashing<decltype(args)>{}(args, h)), ...);
+          ((h = hashing<std::decay_t<decltype(args)>>{}(args, h)), ...);
         },
         el);
     return h;

diff --git a/include/cista/targets/file.h b/include/cista/targets/file.h
@@ -206,7 +206,8 @@ struct file {
 
   file(char const* path, char const* mode)
       : f_{std::fopen(path, mode)}, size_{size()} {
-    verify(f_ != nullptr, "unable to open file");
+    verify(f_ != nullptr, std::string{"unable to open file: "} + path +
+                              " [mode=" + mode + "]");
   }
 
   ~file() {

diff --git a/include/cista/verify.h b/include/cista/verify.h
@@ -1,15 +1,16 @@
 #pragma once
 
 #include <stdexcept>
+#include <string>
 
 #include "cista/cista_exception.h"
 #include "cista/exception.h"
 
 namespace cista {
 
-inline void verify(bool const condition, char const* msg) {
+inline void verify(bool const condition, std::string msg) {
   if (!condition) {
-    throw_exception(cista_exception{msg});
+    throw_exception(cista_exception{std::move(msg)});
   }
 }