diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp index e0bb79c73..1fa6f0bbf 100644 --- a/plugins/input/shape/shape_index_featureset.cpp +++ b/plugins/input/shape/shape_index_featureset.cpp @@ -40,15 +40,6 @@ #include "shape_utils.hpp" #include - -// operator>> needed by mapnik::spatial_index -template -InputStream & operator>>(InputStream & in, std::streampos & pos) -{ - in.read(reinterpret_cast(&pos), sizeof(std::streampos)); - return in; -} - using mapnik::feature_factory; template @@ -73,10 +64,9 @@ shape_index_featureset::shape_index_featureset(filterT const& filter, if (index) { #ifdef SHAPE_MEMORY_MAPPED_FILE - //spatial_index >::query(filter, index->file(), offsets_); - mapnik::util::spatial_index::query(filter, index->file(), offsets_); + mapnik::util::spatial_index::query(filter, index->file(), offsets_); #else - mapnik::util::spatial_index::query(filter, index->file(), offsets_); + mapnik::util::spatial_index::query(filter, index->file(), offsets_); #endif } std::sort(offsets_.begin(), offsets_.end()); diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp index cf52aa0c2..80c8fa681 100644 --- a/plugins/input/shape/shape_index_featureset.hpp +++ b/plugins/input/shape/shape_index_featureset.hpp @@ -63,8 +63,8 @@ private: context_ptr ctx_; std::unique_ptr shape_ptr_; const std::unique_ptr tr_; - std::vector offsets_; - std::vector::iterator itr_; + std::vector offsets_; + std::vector::iterator itr_; std::vector attr_ids_; mapnik::value_integer row_limit_; mutable int count_;