From 305bd7794beb2431b67470b3b98a7a17ab6f7ba3 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Wed, 26 Jun 2024 15:40:43 +0200 Subject: [PATCH] Fixed Win tests --- include/sparrow/data_traits.hpp | 6 +++--- test/test_array.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sparrow/data_traits.hpp b/include/sparrow/data_traits.hpp index 34a3ea994..1e7bbd3a4 100644 --- a/include/sparrow/data_traits.hpp +++ b/include/sparrow/data_traits.hpp @@ -16,6 +16,7 @@ #include "sparrow/data_type.hpp" #include "sparrow/fixed_size_layout.hpp" +#include "sparrow/null_layout.hpp" #include "sparrow/variable_size_binary_layout.hpp" namespace sparrow @@ -32,9 +33,8 @@ namespace sparrow struct arrow_traits { static constexpr data_type type_id = data_type::NA; - using value_type = std::nullopt_t; - using default_layout = fixed_size_layout; // TODO: replace this by a special layout - // that's always empty + using value_type = null_type; + using default_layout = null_layout; }; template <> diff --git a/test/test_array.cpp b/test/test_array.cpp index b0d208016..767723857 100644 --- a/test/test_array.cpp +++ b/test/test_array.cpp @@ -47,7 +47,7 @@ TEST_SUITE("const_array_iterator") TEST_CASE("default constructor") { - const_iter_type iter; + [[maybe_unused]] const_iter_type iter; } TEST_CASE_TEMPLATE_DEFINE("all", T, all) @@ -55,7 +55,7 @@ TEST_SUITE("const_array_iterator") SUBCASE("constructor") { auto tarray = make_test_typed_array(); - const_iter_type iter(tarray.cbegin()); + [[maybe_unused]] const_iter_type iter(tarray.cbegin()); } SUBCASE("equality") @@ -179,7 +179,7 @@ TEST_SUITE("array") { SUBCASE("constructor") { - auto ar = make_test_array(); + [[maybe_unused]] auto ar = make_test_array(); } SUBCASE("empty")