diff --git a/include/boost/histogram/axis.hpp b/include/boost/histogram/axis.hpp index 976f4fdd..f8ba4e41 100644 --- a/include/boost/histogram/axis.hpp +++ b/include/boost/histogram/axis.hpp @@ -194,7 +194,7 @@ public: const std::string& label = std::string(), bool uoflow = true); - integer_axis() {} + integer_axis() : min_(0) {} integer_axis(const integer_axis&); integer_axis& operator=(const integer_axis&); diff --git a/include/boost/histogram/detail/nstore.hpp b/include/boost/histogram/detail/nstore.hpp index d077b898..4e2b5e6d 100644 --- a/include/boost/histogram/detail/nstore.hpp +++ b/include/boost/histogram/detail/nstore.hpp @@ -139,8 +139,8 @@ private: template bool add_impl_(size_type i, const uint64_t & oi) { - T& b = ((T*)buffer_)[i]; - if (T(std::numeric_limits::max() - b) >= oi) { + T& b = static_cast(buffer_)[i]; + if (static_cast(std::numeric_limits::max() - b) >= oi) { b += oi; return true; } else grow(); /* and fall through */ diff --git a/include/boost/histogram/histogram.hpp b/include/boost/histogram/histogram.hpp index 6c7b9ef5..02fe2992 100644 --- a/include/boost/histogram/histogram.hpp +++ b/include/boost/histogram/histogram.hpp @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include #include @@ -175,7 +173,6 @@ BOOST_PP_REPEAT_FROM_TO(1, BOOST_HISTOGRAM_AXIS_LIMIT, BOOST_HISTOGRAM_VARIANCE, private: detail::nstore data_; - friend class serialization::access; template friend void serialize(Archive& ar, histogram & h, unsigned version); };