boost/histogram
2
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2026-02-23 15:52:11 +00:00
Code Issues Projects Releases Wiki Activity

test and fix mixed assignment

Browse Source
This commit is contained in:
Hans Dembinski
2017-04-27 14:30:10 +02:00
parent ce7046d1a4
commit aecfab98bb
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/histogram/detail/axis_visitor.hpp
View File

@@ -116,7 +116,7 @@ template <typename Iterator> struct fusion_assign_axis {
template <typename Iterator> struct fusion_assign_axis2 {
mutable Iterator iter;
fusion_assign_axis2(Iterator it) : iter(it) {}
template <typename T> void operator()(const T &t) const { *(iter++) == t; }
template <typename T> void operator()(const T &t) const { *(iter++) = t; }
};
struct field_count : public static_visitor<void> {
@@ -148,7 +148,7 @@ inline bool axes_equal_impl(mpl::false_, mpl::false_, const A &a, const B &b) {
template <typename A, typename B>
inline bool axes_equal_impl(mpl::false_, mpl::true_, const A &a, const B &b) {
if (a.size() != fusion::size(b))
if (a.size() != static_cast<int>(fusion::size(b)))
return false;
fusion_cmp_axis<typename A::const_iterator> cmp(a.begin());
fusion::for_each(b, cmp);
@@ -188,13 +188,13 @@ inline void axes_assign_impl(mpl::false_, mpl::false_, A &a, const B &b) {
template <typename A, typename B>
inline void axes_assign_impl(mpl::false_, mpl::true_, A &a, const B &b) {
a.resize(fusion::size(b));
fusion::for_each(b, fusion_assign_axis2<typename A::iterator>(b.begin()));
fusion::for_each(b, fusion_assign_axis2<typename A::iterator>(a.begin()));
}
template <typename A, typename B>
inline void axes_assign_impl(mpl::true_, mpl::false_, A &a, const B &b) {
BOOST_ASSERT_MSG(
fusion::size(a) == b.size(),
static_cast<int>(fusion::size(a)) == b.size(),
"cannot assign to static axes vector: number of axes does not match");
fusion::for_each(a,
fusion_assign_axis<typename B::const_iterator>(b.begin()));