chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

forgot dataHeader() in ValueRange -> fix

Browse source
This commit is contained in:
Christian Zimmermann 2018-11-07 13:27:45 +01:00
parent fa1f16a3c8
commit 15388dcdfa
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/include/ranges/value_range.h
View file

@ -109,7 +109,8 @@ namespace MultiArrayTools
virtual size_t dim() const final; virtual size_t dim() const final;
virtual SpaceType spaceType() const final; virtual SpaceType spaceType() const final;
virtual DataHeader dataHeader() const final;
virtual std::string stringMeta(size_t pos) const final; virtual std::string stringMeta(size_t pos) const final;
virtual std::vector<char> data() const final; virtual std::vector<char> data() const final;
@ -355,11 +356,7 @@ namespace MultiArrayTools
std::vector<char> ValueRange<U>::data() const std::vector<char> ValueRange<U>::data() const
{ {
assert(0); assert(0);
DataHeader h; DataHeader h = dataHeader();
h.spaceType = static_cast<int>( SpaceType::NONE );
h.metaSize = 0;
h.metaType = NumTypeMap<U>::num;
h.multiple = 0;
std::vector<char> out; std::vector<char> out;
out.reserve(h.metaSize + sizeof(DataHeader)); out.reserve(h.metaSize + sizeof(DataHeader));
char* hcp = reinterpret_cast<char*>(&h); char* hcp = reinterpret_cast<char*>(&h);
@ -369,7 +366,18 @@ namespace MultiArrayTools
//out.insert(out.end(), scp, scp + h.metaSize); //out.insert(out.end(), scp, scp + h.metaSize);
return out; return out;
} }
template <typename U>
DataHeader ValueRange<U>::dataHeader() const
{
DataHeader h;
h.spaceType = static_cast<int>( SpaceType::NONE );
h.metaSize = 0;
h.metaType = NumTypeMap<U>::num;
h.multiple = 0;
return h;
}
template <typename U> template <typename U>
typename ValueRange<U>::IndexType ValueRange<U>::begin() const typename ValueRange<U>::IndexType ValueRange<U>::begin() const
{ {