diff options
Diffstat (limited to 'modules/codec/c++/data.h')
| -rw-r--r-- | modules/codec/c++/data.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/codec/c++/data.h b/modules/codec/c++/data.h index 237ef5a..365405f 100644 --- a/modules/codec/c++/data.h +++ b/modules/codec/c++/data.h @@ -1,7 +1,7 @@ #pragma once -#include <forstio/core/common.h> -#include <forstio/core/templates.h> +#include <forstio/common.h> +#include <forstio/templates.h> #include <cassert> @@ -207,7 +207,7 @@ class data<schema::Array<T,Dim>, encode::Native> { template<std::integral... Dims> data(Dims... size_): - data{{size_...}} + data{{static_cast<std::size_t>(size_)...}} { static_assert(sizeof...(Dims)==Dim, "Argument size must be equal to the Dimension"); } @@ -222,12 +222,12 @@ class data<schema::Array<T,Dim>, encode::Native> { template<std::integral... Dims> data<T, encode::Native>& at(Dims... i){ - return value_.at(this->get_flat_index({i...})); + return value_.at(this->get_flat_index({static_cast<std::size_t>(i)...})); } template<std::integral... Dims> const data<T, encode::Native>& at(Dims... i) const { - return value_.at(this->get_flat_index({i...})); + return value_.at(this->get_flat_index({static_cast<std::size_t>(i)...})); } std::size_t get_dim_size(std::size_t i) const { @@ -352,7 +352,7 @@ class data<schema::Primitive<T,N>, encode::Native> { private: typename native_data_type<schema::Primitive<T,N>>::type value_; public: - data():value_{{}}{}; + data():value_{}{} SAW_DEFAULT_COPY(data); SAW_DEFAULT_MOVE(data); |