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

explicit move ctor for feature_type_style

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-01 13:54:44 -07:00
parent ed3bc1d411
commit 9b2c14466c
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/feature_type_style.hpp
View file

@ -68,7 +68,7 @@ public:
// ctor // ctor
feature_type_style(); feature_type_style();
feature_type_style(feature_type_style const& rhs); feature_type_style(feature_type_style const& rhs);
feature_type_style(feature_type_style &&) = default; feature_type_style(feature_type_style && rhs);
feature_type_style& operator=(feature_type_style rhs); feature_type_style& operator=(feature_type_style rhs);
// comparison // comparison

13
src/feature_type_style.cpp
View file

@ -56,9 +56,16 @@ feature_type_style::feature_type_style(feature_type_style const& rhs)
direct_filters_(rhs.direct_filters_), direct_filters_(rhs.direct_filters_),
comp_op_(rhs.comp_op_), comp_op_(rhs.comp_op_),
opacity_(rhs.opacity_), opacity_(rhs.opacity_),
image_filters_inflate_(rhs.image_filters_inflate_) image_filters_inflate_(rhs.image_filters_inflate_) {}
{
} feature_type_style::feature_type_style(feature_type_style && rhs)
: rules_(std::move(rhs.rules_)),
filter_mode_(std::move(rhs.filter_mode_)),
filters_(std::move(rhs.filters_)),
direct_filters_(std::move(rhs.direct_filters_)),
comp_op_(std::move(rhs.comp_op_)),
opacity_(std::move(rhs.opacity_)),
image_filters_inflate_(std::move(rhs.image_filters_inflate_)) {}
feature_type_style& feature_type_style::operator=(feature_type_style rhs) feature_type_style& feature_type_style::operator=(feature_type_style rhs)
{ {