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

mapnik::Map - implement assignment-op in terms of swap

Browse source
This commit is contained in:
artemp 2014-01-28 09:56:45 +00:00
parent 5083f3a30e
commit 6f81c88f9a
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/map.hpp
View file

@ -123,7 +123,7 @@ public:
* TODO: to be documented
*
*/
Map& operator=(Map const& rhs);
Map& operator=(Map rhs);
/*! \brief Get all styles
* @return Const reference to styles

19
src/map.cpp
View file

@ -101,24 +101,9 @@ Map::Map(Map const& rhs)
Map::~Map() {}
Map& Map::operator=(Map const& rhs)
Map& Map::operator=(Map rhs)
{
if (this==&rhs) return *this;
width_= rhs.width_;
height_= rhs.height_;
srs_ = rhs.srs_;
buffer_size_ = rhs.buffer_size_;
background_ = rhs.background_;
background_image_ = rhs.background_image_;
background_image_comp_op_ = rhs.background_image_comp_op_;
background_image_opacity_ = rhs.background_image_opacity_;
styles_ = rhs.styles_;
fontsets_ = rhs.fontsets_;
layers_ = rhs.layers_;
aspectFixMode_ = rhs.aspectFixMode_;
maximum_extent_ = rhs.maximum_extent_;
base_path_ = rhs.base_path_;
extra_params_ = rhs.extra_params_;
std::swap(*this, rhs);
return *this;
}