sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

out-of-class swap method to be consistent

Browse source
This commit is contained in:
artemp 2014-05-27 11:21:13 +01:00
parent eb0b4dbc0b
commit c8b8937bf9
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/box2d.hpp
View file

@ -57,7 +57,14 @@ private:
T miny_; T miny_;
T maxx_; T maxx_;
T maxy_; T maxy_;
void swap(box2d_type & rhs); friend inline void swap(box2d_type & lhs, box2d_type & rhs)
{
using std::swap;
swap(lhs.minx_, rhs.minx_);
swap(lhs.miny_, rhs.miny_);
swap(lhs.maxx_, rhs.maxx_);
swap(lhs.maxy_, rhs.maxy_);
}
public: public:
box2d(); box2d();
box2d(T minx,T miny,T maxx,T maxy); box2d(T minx,T miny,T maxx,T maxy);

12
src/box2d.cpp
View file

@ -80,19 +80,10 @@ box2d<T>::box2d(box2d_type && rhs)
template <typename T> template <typename T>
box2d<T>& box2d<T>::operator=(box2d_type other) box2d<T>& box2d<T>::operator=(box2d_type other)
{ {
swap(other); swap(*this, other);
return *this; return *this;
} }
template <typename T>
void box2d<T>::swap(box2d_type & other)
{
std::swap(minx_, other.minx_);
std::swap(miny_, other.miny_);
std::swap(maxx_, other.maxx_);
std::swap(maxy_, other.maxy_);
}
template <typename T> template <typename T>
box2d<T>::box2d(box2d_type const& rhs, agg::trans_affine const& tr) box2d<T>::box2d(box2d_type const& rhs, agg::trans_affine const& tr)
{ {
@ -471,4 +462,5 @@ box2d<T>& box2d<T>::operator*=(agg::trans_affine const& tr)
template class box2d<int>; template class box2d<int>;
template class box2d<double>; template class box2d<double>;
} }