finish move to cpp for rule class and fixup includes

This commit is contained in:
Dane Springmeyer 2013-01-03 19:57:09 -08:00
parent 100f07c5da
commit bf649176ae
2 changed files with 16 additions and 10 deletions

View File

@ -174,16 +174,7 @@ public:
private:
void swap(rule& rhs) throw()
{
name_=rhs.name_;
min_scale_=rhs.min_scale_;
max_scale_=rhs.max_scale_;
syms_=rhs.syms_;
filter_=rhs.filter_;
else_filter_=rhs.else_filter_;
also_filter_=rhs.also_filter_;
}
void swap(rule& rhs) throw();
};
}

View File

@ -22,8 +22,12 @@
// mapnik
#include <mapnik/rule.hpp>
#include <mapnik/debug.hpp>
#include <mapnik/raster_colorizer.hpp>
// stl
#include <limits>
namespace {
struct deepcopy_symbolizer : public boost::static_visitor<>
@ -133,6 +137,17 @@ bool rule::operator==(rule const& other)
return (this == &other);
}
void rule::swap(rule& rhs) throw()
{
name_=rhs.name_;
min_scale_=rhs.min_scale_;
max_scale_=rhs.max_scale_;
syms_=rhs.syms_;
filter_=rhs.filter_;
else_filter_=rhs.else_filter_;
also_filter_=rhs.also_filter_;
}
void rule::set_max_scale(double scale)
{
max_scale_=scale;