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

fix UPos/EPos operator+

Browse source
This commit is contained in:
Christian Zimmermann 2024-07-28 08:17:19 +02:00
parent 88c40d702a
commit b2dcf54d65
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/include/xpr/pos_type.cc.h
View file

@ -129,9 +129,10 @@ namespace CNORXZ
} }
template <class PosT> template <class PosT>
constexpr UPos UPos::operator+(const PosT& in) const constexpr decltype(auto) UPos::operator+(const PosT& in) const
{ {
if constexpr(is_epos_type<PosT>::value){ if constexpr(is_epos_type<PosT>::value){
//return in;
return mkEPos<epos_size<PosT>::value>(*this,SPos<0>{}) + in; return mkEPos<epos_size<PosT>::value>(*this,SPos<0>{}) + in;
} }
else { else {
@ -711,13 +712,13 @@ namespace CNORXZ
if constexpr(is_epos_type<PosT>::value){ if constexpr(is_epos_type<PosT>::value){
return iter<0,sizeof...(OPosTs)> return iter<0,sizeof...(OPosTs)>
( [&](auto i) { return std::get<i>(mP)+a.template get<i>(); }, ( [&](auto i) { return std::get<i>(mP)+a.template get<i>(); },
[&](const auto&... e) { return epos(BPosT::operator+(a),e...); } ); [&](const auto&... e) { return epos(BPosT::operator+(a.scal()),e...); } );
} }
else { else {
auto ax = mkEPos<sizeof...(OPosTs)>(a,a*SPos<0>{}); auto ax = mkEPos<sizeof...(OPosTs)>(a,a*SPos<0>{});
return iter<0,sizeof...(OPosTs)> return iter<0,sizeof...(OPosTs)>
( [&](auto i) { return std::get<i>(mP)+ax.template get<i>(); }, ( [&](auto i) { return std::get<i>(mP)+ax.template get<i>(); },
[&](const auto&... e) { return epos(BPosT::operator+(ax),e...); } ); [&](const auto&... e) { return epos(BPosT::operator+(a),e...); } );
} }
} }

2
src/include/xpr/pos_type.h
View file

@ -63,7 +63,7 @@ namespace CNORXZ
constexpr const SizeT& val() const; constexpr const SizeT& val() const;
template <class PosT> template <class PosT>
constexpr UPos operator+(const PosT& a) const; constexpr decltype(auto) operator+(const PosT& a) const;
template <class PosT> template <class PosT>
constexpr UPos operator-(const PosT& a) const; constexpr UPos operator-(const PosT& a) const;