Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/h5cpp/core/iterator_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ std::ostream &operator<<(std::ostream &stream,const IterationOrder &order)
case IterationOrder::Decreasing: return stream<<"DECREASING";
case IterationOrder::Increasing: return stream<<"INCREASING";
case IterationOrder::Native: return stream<<"NATIVE";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default: break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -44,6 +52,14 @@ std::ostream &operator<<(std::ostream &stream,const IterationIndex &index)
{
case IterationIndex::CreationOrder: return stream<<"CREATION_ORDER";
case IterationIndex::Name: return stream<<"NAME";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default: break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down
9 changes: 9 additions & 0 deletions src/h5cpp/core/object_handle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,15 @@ ObjectHandle::Type ObjectHandle::get_type() const
#endif
case H5I_NTYPES:
break;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
std::stringstream ss;
ss << "ObjectHandle: unknown object type=" << type;
Expand Down
11 changes: 10 additions & 1 deletion src/h5cpp/dataspace/selection_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,16 @@ SelectionType SelectionManager::type() const {
case H5S_SEL_POINTS:return SelectionType::Points;
case H5S_SEL_HYPERSLABS:return SelectionType::Hyperslab;
case H5S_SEL_ALL:return SelectionType::All;
case H5S_SEL_N:assert(false); // Added H5S_SEL_N to silence compiler
case H5S_SEL_N:assert(false); break; // Added H5S_SEL_N to silence compiler
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return {};
}
Expand Down
33 changes: 27 additions & 6 deletions src/h5cpp/dataspace/type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,17 @@ std::ostream &operator<<(std::ostream &stream, const Type &t) {
case Type::Scalar: return stream << "SCALAR";
case Type::Simple: return stream << "SIMPLE";
case Type::NoData: return stream << "NODATA";
#ifndef __clang__
default:return stream;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}

std::ostream &operator<<(std::ostream &stream, const SelectionType &t) {
Expand All @@ -47,10 +54,17 @@ std::ostream &operator<<(std::ostream &stream, const SelectionType &t) {
case SelectionType::Points: return stream << "POINTS";
case SelectionType::Hyperslab: return stream << "HYPERSLAB";
case SelectionType::All: return stream << "ALL";
#ifndef __clang__
default:return stream;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;

}

Expand All @@ -64,10 +78,17 @@ std::ostream &operator<<(std::ostream &stream, const SelectionOperation &o) {
case SelectionOperation::NotA: return stream << "NOTA";
case SelectionOperation::Append: return stream << "APPEND";
case SelectionOperation::Prepend: return stream << "PREPEND";
#ifndef __clang__
default:return stream;
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;

}

Expand Down
2 changes: 1 addition & 1 deletion src/h5cpp/dataspace/view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class DLL_EXPORT View {
//! them by the new set of selections provided by the \c selections
//! argument.
//!
//! \throws std::runtime_error
//! \throws std::runtime_error in case of a failure
void operator()(const SelectionList &selections) const;

//!
Expand Down
72 changes: 72 additions & 0 deletions src/h5cpp/datatype/types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ std::ostream &operator<<(std::ostream &stream, const Class &c) {
case Class::Enum: return stream << "ENUM";
case Class::VarLength: return stream << "VARLENGTH";
case Class::Array: return stream << "ARRAY";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -54,6 +63,15 @@ std::ostream &operator<<(std::ostream &stream, const Order &o) {
case Order::LE: return stream << "LE";
case Order::Vax: return stream << "VAX";
case Order::None: return stream << "NONE";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -62,6 +80,15 @@ std::ostream &operator<<(std::ostream &stream, const Sign &s) {
switch (s) {
case Sign::TwosComplement: return stream << "TWOS COMPLEMENT";
case Sign::Unsigned: return stream << "UNSIGNED";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -71,6 +98,15 @@ std::ostream &operator<<(std::ostream &stream, const Norm &n) {
case Norm::Implied: return stream << "IMPLIED";
case Norm::MSBSet: return stream << "MSBSET";
case Norm::None: return stream << "NONE";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -80,6 +116,15 @@ std::ostream &operator<<(std::ostream &stream, const Pad &p) {
case Pad::Background: return stream << "BACKGROUND";
case Pad::One: return stream << "ONE";
case Pad::Zero: return stream << "ZERO";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -89,6 +134,15 @@ std::ostream &operator<<(std::ostream &stream, const StringPad &pad) {
case StringPad::NullPad: return stream << "NULLPAD";
case StringPad::NullTerm: return stream << "NULLTERM";
case StringPad::SpacePad: return stream << "SPACEPAD";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -97,6 +151,15 @@ std::ostream &operator<<(std::ostream &stream, const Direction &d) {
switch (d) {
case Direction::Ascend: return stream << "ASCEND";
case Direction::Descend: return stream << "DESCEND";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand All @@ -105,6 +168,15 @@ std::ostream &operator<<(std::ostream &stream, const CharacterEncoding &enc) {
switch (enc) {
case CharacterEncoding::ASCII: return stream << "ASCII";
case CharacterEncoding::UTF8: return stream << "UTF8";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down
36 changes: 36 additions & 0 deletions src/h5cpp/file/types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ std::ostream &operator<<(std::ostream &stream,const AccessFlags &flags)
#if H5_VERSION_GE(1,10,0)
case AccessFlags::SWMRRead: return stream<<"SWMR READ";
case AccessFlags::SWMRWrite: return stream<<"SWMR WRITE";
#endif
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
Expand Down Expand Up @@ -86,6 +95,15 @@ std::ostream &operator<<(std::ostream &stream,const ImageFlags &flags)
case ImageFlags::DontCopy: return stream<<"DONT COPY";
case ImageFlags::DontRelease: return stream<<"DONT RELEASE";
case ImageFlags::All: return stream<<"ALL";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down Expand Up @@ -132,6 +150,15 @@ std::ostream &operator<<(std::ostream &stream,const SearchFlags &flags)
case SearchFlags::File: return stream<<"FILE";
case SearchFlags::Group: return stream<<"GROUP";
case SearchFlags::Local: return stream<<"LOCAL";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down Expand Up @@ -172,6 +199,15 @@ std::ostream &operator<<(std::ostream &stream,const Scope &scope)
{
case Scope::Global: return stream<<"GLOBAL";
case Scope::Local: return stream<<"LOCAL";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down
9 changes: 9 additions & 0 deletions src/h5cpp/filter/scaleoffset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,15 @@ std::ostream &operator<<(std::ostream &stream, const ScaleOffset::ScaleType &sca
case ScaleOffset::ScaleType::FloatDScale: return stream << "FLOAT_DSCALE";
case ScaleOffset::ScaleType::FloatEScale: return stream << "FLOAT_ESCALE";
case ScaleOffset::ScaleType::Int: return stream << "INT";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down
9 changes: 9 additions & 0 deletions src/h5cpp/filter/szip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ std::ostream &operator<<(std::ostream &stream,const SZip::OptionMask &flags)
case SZip::OptionMask::Chip : return stream<<"CHIP_CODING";
case SZip::OptionMask::EntropyCoding : return stream<<"ENTROPY_CODING";
case SZip::OptionMask::NearestNeighbor : return stream<<"NEAREST_NEIGHBOR_CODING";
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcovered-switch-default"
#endif
default:
break;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
}
return stream;
}
Expand Down
11 changes: 9 additions & 2 deletions src/h5cpp/node/dataset.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ std::uint32_t Dataset::read_chunk(T &data,
std::vector<hsize_t> & offset,
const property::DatasetTransferList &dtpl) const
{
std::uint32_t filter_mask;
std::uint32_t filter_mask = 0;
if(mem_type.get_class() == datatype::Class::Integer)
{
#if H5_VERSION_GE(2,0,0)
Expand All @@ -1070,7 +1070,14 @@ std::uint32_t Dataset::read_chunk(T &data,
error::Singleton::instance().throw_with_stack(ss.str());
}
#else
read_chunk(data, mem_type, offset, dtpl);
if(chunk_storage_size(offset) <= byte_size){
read_chunk(data, mem_type, offset, dtpl);
}
else {
std::stringstream ss;
ss<<"Failure to read chunk data from dataset ["<<link().path()<<"]!";
error::Singleton::instance().throw_with_stack(ss.str());
}
#endif
}
else
Expand Down
Loading
Loading