Merge pull request #1 from klemens-morgenstern/develop

Small fix
This commit is contained in:
Klemens Morgenstern
2016-06-18 19:36:48 +02:00
committed by GitHub
3 changed files with 3 additions and 6 deletions

View File

@@ -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&);

View File

@@ -139,8 +139,8 @@ private:
template<typename T>
bool add_impl_(size_type i, const uint64_t & oi)
{
T& b = ((T*)buffer_)[i];
if (T(std::numeric_limits<T>::max() - b) >= oi) {
T& b = static_cast<T*>(buffer_)[i];
if (static_cast<T>(std::numeric_limits<T>::max() - b) >= oi) {
b += oi;
return true;
} else grow(); /* and fall through */

View File

@@ -11,8 +11,6 @@
#include <boost/histogram/basic_histogram.hpp>
#include <boost/histogram/detail/nstore.hpp>
#include <boost/preprocessor.hpp>
#include <boost/serialization/access.hpp>
#include <boost/serialization/base_object.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits.hpp>
#include <boost/shared_ptr.hpp>
@@ -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 <class Archive>
friend void serialize(Archive& ar, histogram & h, unsigned version);
};