+ swap patch from @joto : http://www.remote.org/jochen/tmp/swap.patch

mapnik · Dec 20, 2012 · 6512d28 · 6512d28
1 parent 6590225
commit 6512d28
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
@@ -47,7 +47,7 @@ class MAPNIK_DECL layer
           std::string const& srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
 
     layer(layer const& l);
-    layer& operator=(layer const& l);
+    layer& operator=(layer const& rhs);
     bool operator==(layer const& other) const;
 
     /*!
@@ -197,7 +197,7 @@ class MAPNIK_DECL layer
     int buffer_size() const;
     ~layer();
 private:
-    void swap(const layer& other);
+    void swap(layer& other);
 
     std::string name_;
     std::string srs_;

diff --git a/src/layer.cpp b/src/layer.cpp
@@ -58,7 +58,7 @@ layer::layer(const layer& rhs)
       buffer_size_(rhs.buffer_size_),
       maximum_extent_(rhs.maximum_extent_) {}
 
-layer& layer::operator=(const layer& rhs)
+layer& layer::operator=(layer const& rhs)
 {
     layer tmp(rhs);
     swap(tmp);
@@ -70,21 +70,22 @@ bool layer::operator==(layer const& other) const
     return (this == &other);
 }
 
-void layer::swap(const layer& rhs)
+void layer::swap(layer& rhs)
-{
+{
-    name_=rhs.name_;
+    using std::swap;
-    srs_ = rhs.srs_;
+    swap(name_, rhs.name_);
-    min_zoom_=rhs.min_zoom_;
+    swap(srs_, rhs.srs_);
-    max_zoom_=rhs.max_zoom_;
+    swap(min_zoom_, rhs.min_zoom_);
-    active_=rhs.active_;
+    swap(max_zoom_, rhs.max_zoom_);
-    queryable_=rhs.queryable_;
+    swap(active_, rhs.active_);
-    clear_label_cache_ = rhs.clear_label_cache_;
+    swap(queryable_, rhs.queryable_);
-    cache_features_ = rhs.cache_features_;
+    swap(clear_label_cache_, rhs.clear_label_cache_);
-    group_by_ = rhs.group_by_;
+    swap(cache_features_, rhs.cache_features_);
-    styles_=rhs.styles_;
+    swap(group_by_,  rhs.group_by_);
-    ds_=rhs.ds_;
+    swap(styles_, rhs.styles_);
-    buffer_size_ = rhs.buffer_size_;
+    swap(ds_, rhs.ds_);
-    maximum_extent_ = rhs.maximum_extent_;
+    swap(buffer_size_, rhs.buffer_size_);
+    swap(maximum_extent_, rhs.maximum_extent_);
 }
 
 layer::~layer() {}