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

c++11 - upfate to canonical operator= impl

Browse source
This commit is contained in:
artemp 2015-10-16 12:46:24 +01:00
parent 652fa15ec0
commit 2437473e74
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/mapnik/attribute_descriptor.hpp
View file

@ -48,7 +48,7 @@ public:
type_(type),
size_(size),
precision_(precision),
primary_key_(primary_key) {}
primary_key_(primary_key) {}
attribute_descriptor(attribute_descriptor const& other)
: name_(other.name_),
@ -57,21 +57,15 @@ public:
precision_(other.precision_),
primary_key_(other.primary_key_) {}
attribute_descriptor& operator=(attribute_descriptor const& other)
attribute_descriptor& operator=(attribute_descriptor rhs)
{
if (this == &other)
{
return *this;
}
else
{
name_=other.name_;
type_=other.type_;
size_=other.size_;
precision_=other.precision_;
primary_key_=other.primary_key_;
return *this;
}
using std::swap;
std::swap(name_, rhs.name_);
std::swap(type_, rhs.type_);
std::swap(size_, rhs.size_);
std::swap(precision_, rhs.precision_);
std::swap(primary_key_, rhs.primary_key_);
return *this;
}
std::string const& get_name() const