use boost::noncopyable
This commit is contained in:
parent
bbfe036c54
commit
71d509a495
2 changed files with 6 additions and 10 deletions
|
@ -31,6 +31,7 @@
|
|||
|
||||
//boost
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
using mapnik::Featureset;
|
||||
using mapnik::box2d;
|
||||
|
@ -39,7 +40,8 @@ using mapnik::transcoder;
|
|||
using mapnik::context_ptr;
|
||||
|
||||
template <typename filterT>
|
||||
class shape_featureset : public Featureset
|
||||
class shape_featureset : public Featureset,
|
||||
private boost::noncopyable
|
||||
{
|
||||
filterT filter_;
|
||||
context_ptr ctx_;
|
||||
|
@ -62,11 +64,6 @@ public:
|
|||
int row_limit);
|
||||
virtual ~shape_featureset();
|
||||
feature_ptr next();
|
||||
|
||||
private:
|
||||
shape_featureset(const shape_featureset&);
|
||||
const shape_featureset& operator=(const shape_featureset&);
|
||||
|
||||
};
|
||||
|
||||
#endif //SHAPE_FEATURESET_HPP
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
// boost
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
#include "shape_datasource.hpp"
|
||||
#include "shape_io.hpp"
|
||||
|
@ -42,7 +43,8 @@ using mapnik::feature_ptr;
|
|||
using mapnik::context_ptr;
|
||||
|
||||
template <typename filterT>
|
||||
class shape_index_featureset : public Featureset
|
||||
class shape_index_featureset : public Featureset,
|
||||
private boost::noncopyable
|
||||
{
|
||||
public:
|
||||
shape_index_featureset(const filterT& filter,
|
||||
|
@ -66,9 +68,6 @@ private:
|
|||
mutable int total_geom_size;
|
||||
mutable int count_;
|
||||
const int row_limit_;
|
||||
//no copying
|
||||
shape_index_featureset(const shape_index_featureset&);
|
||||
shape_index_featureset& operator=(const shape_index_featureset&);
|
||||
};
|
||||
|
||||
#endif // SHAPE_INDEX_FEATURESET_HPP
|
||||
|
|
Loading…
Reference in a new issue