From 9b2c14466c0af490d739ed5a7357656c5f5dfe9c Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 1 Oct 2014 13:54:44 -0700 Subject: [PATCH] explicit move ctor for feature_type_style --- include/mapnik/feature_type_style.hpp | 2 +- src/feature_type_style.cpp | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/mapnik/feature_type_style.hpp b/include/mapnik/feature_type_style.hpp index 760e8b6e8..783595401 100644 --- a/include/mapnik/feature_type_style.hpp +++ b/include/mapnik/feature_type_style.hpp @@ -68,7 +68,7 @@ public: // ctor feature_type_style(); 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); // comparison diff --git a/src/feature_type_style.cpp b/src/feature_type_style.cpp index d98be3ba8..87752261b 100644 --- a/src/feature_type_style.cpp +++ b/src/feature_type_style.cpp @@ -56,9 +56,16 @@ feature_type_style::feature_type_style(feature_type_style const& rhs) direct_filters_(rhs.direct_filters_), comp_op_(rhs.comp_op_), 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) {