Fix wrongly defined Blob concept

The previous definition only did a syntax check but did not evaluate the expression.
alpaka-group · Dec 15, 2022 · 4bd78dc · 4bd78dc
1 parent 38ebb45
commit 4bd78dc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/examples/memmap/memmap.cpp b/examples/memmap/memmap.cpp
@@ -51,7 +51,7 @@ auto main(int argc, const char* argv[]) -> int
 
     // memory map the teapot geometry file
     auto file = boost::iostreams::mapped_file_source(argv[1]);
-    const char* content = file.data();
+    const auto* content = reinterpret_cast<const std::byte*>(file.data());
     const auto size = file.size();
 
     // binary STL header is 80 bytes, followed by uint32 triangle count, followed by vertex data without padding

diff --git a/include/llama/Concepts.hpp b/include/llama/Concepts.hpp
@@ -92,11 +92,12 @@ namespace llama
     template <typename M>
     concept PartiallyComputedMapping = Mapping<M> && allFieldsArePhysicalOrComputed<M>;
 
+    // according to http://eel.is/c++draft/intro.object#3 only std::byte and unsigned char can provide storage for
+    // other types
     template<typename B>
     concept Blob = requires(B b, std::size_t i) {
-        // according to http://eel.is/c++draft/intro.object#3 only std::byte and unsigned char can provide storage for
-        // other types
-        std::is_same_v<decltype(b[i]), std::byte&> || std::is_same_v<decltype(b[i]), unsigned char&>;
+        requires std::is_same_v<std::remove_cvref_t<decltype(b[i])>, std::byte> ||
+            std::is_same_v<std::remove_cvref_t<decltype(b[i])>, unsigned char>;
     };
 
     template <typename BA>

diff --git a/tests/bloballocators.cpp b/tests/bloballocators.cpp
@@ -1,8 +1,26 @@
 #include "common.hpp"
 
+#include <memory>
+#include <vector>
+
 using ArrayExtents = llama::ArrayExtents<int, 16>;
 using Mapping = llama::mapping::AoS<ArrayExtents, Vec3I>;
 
+TEST_CASE("blob.concept")
+{
+#ifdef __cpp_lib_concepts
+    STATIC_REQUIRE(llama::Blob<llama::Array<std::byte, 10>>);
+    STATIC_REQUIRE(llama::Blob<llama::Array<unsigned char, 10>>);
+    STATIC_REQUIRE(!llama::Blob<llama::Array<char, 10>>);
+    STATIC_REQUIRE(!llama::Blob<llama::Array<double, 10>>);
+
+    STATIC_REQUIRE(llama::Blob<std::vector<std::byte>>);
+    STATIC_REQUIRE(llama::Blob<std::unique_ptr<std::byte[]>>);
+    STATIC_REQUIRE(llama::Blob<std::shared_ptr<std::byte[]>>);
+    STATIC_REQUIRE(llama::Blob<std::byte*>);
+#endif
+}
+
 TEST_CASE("bloballocators.Array")
 {
     constexpr auto mapping = Mapping{{}};