From ac8655aead1dba14df63aaafbbff6ffc15fbfcff Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem at mapnik>
Date: Thu, 12 Jan 2012 12:28:53 +0000
Subject: [PATCH] remove unused data members

---
 plugins/input/shape/shape_featureset.cpp       |  4 ++--
 plugins/input/shape/shape_featureset.hpp       |  6 ++----
 plugins/input/shape/shape_index_featureset.cpp |  4 ++--
 plugins/input/shape/shape_index_featureset.hpp | 12 ++++++------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugins/input/shape/shape_featureset.cpp b/plugins/input/shape/shape_featureset.cpp
index 650aceb93..e180bdfbc 100644
--- a/plugins/input/shape/shape_featureset.cpp
+++ b/plugins/input/shape/shape_featureset.cpp
@@ -45,8 +45,8 @@ shape_featureset<filterT>::shape_featureset(filterT const& filter,
       query_ext_(),
       tr_(new transcoder(encoding)),
       file_length_(file_length),
-      count_(0),
-      row_limit_(row_limit)
+      row_limit_(row_limit),
+      count_(0)
 {
     ctx_ = boost::make_shared<mapnik::context>();
     shape_.shp().skip(100);
diff --git a/plugins/input/shape/shape_featureset.hpp b/plugins/input/shape/shape_featureset.hpp
index f6780be05..2cd87a6a1 100644
--- a/plugins/input/shape/shape_featureset.hpp
+++ b/plugins/input/shape/shape_featureset.hpp
@@ -50,11 +50,9 @@ class shape_featureset : public Featureset,
     boost::scoped_ptr<transcoder> tr_;
     long file_length_;
     std::vector<int> attr_ids_;
-    mutable box2d<double> feature_ext_;
-    mutable int total_geom_size;
-    mutable int count_;
     const int row_limit_;
-
+    mutable int count_;
+    
 public:
     shape_featureset(filterT const& filter,
                      std::string const& shape_file,
diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp
index fba16f73b..f7da99d9b 100644
--- a/plugins/input/shape/shape_index_featureset.cpp
+++ b/plugins/input/shape/shape_index_featureset.cpp
@@ -46,8 +46,8 @@ shape_index_featureset<filterT>::shape_index_featureset(filterT const& filter,
     : filter_(filter),
       shape_(shape),
       tr_(new transcoder(encoding)),
-      count_(0),
-      row_limit_(row_limit)
+      row_limit_(row_limit),
+      count_(0)
 {
     ctx_ = boost::make_shared<mapnik::context>();
     shape_.shp().skip(100);
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index cbdaf4e6d..cab65bc93 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -47,13 +47,15 @@ class shape_index_featureset : public Featureset,
                                private boost::noncopyable
 {
 public:
-    shape_index_featureset(const filterT& filter,
-                           shape_io& shape,
-                           const std::set<std::string>& attribute_names,
+    shape_index_featureset(filterT const& filter,
+                           shape_io & shape,
+                           std::set<std::string> const& attribute_names,
                            std::string const& encoding,
                            std::string const& shape_name,
                            int row_limit);
+    
     virtual ~shape_index_featureset();
+    
     feature_ptr next();
 
 private:
@@ -64,10 +66,8 @@ private:
     std::vector<int> ids_;
     std::vector<int>::iterator itr_;
     std::vector<int> attr_ids_;
-    mutable box2d<double> feature_ext_;
-    mutable int total_geom_size;
-    mutable int count_;
     const int row_limit_;
+    mutable int count_;
 };
 
 #endif // SHAPE_INDEX_FEATURESET_HPP