From 69447ce54b389bb48c34788e7c202cbb44a7e15e Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Sun, 4 Oct 2020 10:52:50 +1100 Subject: [PATCH] build; bump dependencies and fix attendant compilation errors --- acl.cpp | 2 +- acl.hpp | 2 +- cruft/crypto | 2 +- cruft/util | 2 +- emory/chunk/map.cpp | 6 ++++-- tools/emory.cpp | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/acl.cpp b/acl.cpp index 46501b3..a8d5360 100644 --- a/acl.cpp +++ b/acl.cpp @@ -28,7 +28,7 @@ acl::acl (int count) //----------------------------------------------------------------------------- acl::acl (std::filesystem::path const &path, acl_type_t type) - : acl (acl_get_file (path.u8string ().c_str (), type)) + : acl (acl_get_file (path.native ().c_str (), type)) { ; } diff --git a/acl.hpp b/acl.hpp index 53526fe..3588d81 100644 --- a/acl.hpp +++ b/acl.hpp @@ -45,7 +45,7 @@ namespace cruft { template ValueT qualifier (void) const { - static_assert (std::is_pod_v); + static_assert (std::is_trivial_v && std::is_standard_layout_v); auto data = acl_get_qualifier (m_native); diff --git a/cruft/crypto b/cruft/crypto index bf27d73..229b3d3 160000 --- a/cruft/crypto +++ b/cruft/crypto @@ -1 +1 @@ -Subproject commit bf27d731e4b2e2bbc4d311cbbdc24da4854f50d2 +Subproject commit 229b3d3f1a576eda21d7d6a45b5727c0e113a7b2 diff --git a/cruft/util b/cruft/util index 5fb87ea..8cdbbcb 160000 --- a/cruft/util +++ b/cruft/util @@ -1 +1 @@ -Subproject commit 5fb87ea4c4e5f30c9ee40a56e3487c0358d69783 +Subproject commit 8cdbbcb26ede127e9ed3a9e9a29b0f694d1d266a diff --git a/emory/chunk/map.cpp b/emory/chunk/map.cpp index 261bddc..6e3c36c 100644 --- a/emory/chunk/map.cpp +++ b/emory/chunk/map.cpp @@ -16,8 +16,10 @@ using emory::chunk::map; /////////////////////////////////////////////////////////////////////////////// -map::map (cruft::view data, const emory::chunk::params &p) -{ +map::map ( + cruft::view data, + emory::chunk::params const &p +) { using hash_type = cruft::hash::buzhash; hash_type h (p.window, data); auto remain = data.consume (p.window); diff --git a/tools/emory.cpp b/tools/emory.cpp index 04b6206..5024165 100644 --- a/tools/emory.cpp +++ b/tools/emory.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include