Added boost::noncopyable to format_t and format_t::element_t

This commit is contained in:
John Wiegley 2012-03-05 15:42:23 -06:00
parent dc9ecc600a
commit e7aaaeab33

View file

@ -55,7 +55,7 @@ class format_t : public expr_base_t<string>, public noncopyable
{ {
typedef expr_base_t<string> base_type; typedef expr_base_t<string> base_type;
struct element_t : public supports_flags<> struct element_t : public supports_flags<>, public noncopyable
{ {
#define ELEMENT_ALIGN_LEFT 0x01 #define ELEMENT_ALIGN_LEFT 0x01
@ -65,7 +65,7 @@ class format_t : public expr_base_t<string>, public noncopyable
std::size_t min_width; std::size_t min_width;
std::size_t max_width; std::size_t max_width;
variant<string, expr_t> data; variant<string, expr_t> data;
shared_ptr<struct element_t> next; scoped_ptr<struct element_t> next;
element_t() throw() element_t() throw()
: supports_flags<>(), type(STRING), min_width(0), max_width(0) { : supports_flags<>(), type(STRING), min_width(0), max_width(0) {
@ -82,7 +82,6 @@ class format_t : public expr_base_t<string>, public noncopyable
min_width = elem.min_width; min_width = elem.min_width;
max_width = elem.max_width; max_width = elem.max_width;
data = elem.data; data = elem.data;
next = elem.next;
} }
return *this; return *this;
} }
@ -104,7 +103,7 @@ class format_t : public expr_base_t<string>, public noncopyable
void dump(std::ostream& out) const; void dump(std::ostream& out) const;
}; };
shared_ptr<element_t> elements; scoped_ptr<element_t> elements;
public: public:
static enum elision_style_t { static enum elision_style_t {