mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Cosmetics in line_iterator

Browse source
This commit is contained in:
Thomas Goyne 2013-06-07 20:04:38 -07:00
parent e668cc45e0
commit cf7d548d17
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
aegisub/libaegisub/include/libaegisub/line_iterator.h
View file

@ -81,12 +81,14 @@ public:
init();
++(*this);
}
/// @brief Invalid iterator constructor; use for end iterator
line_iterator()
: stream(0)
, valid(false)
{
}
/// @brief Copy constructor
/// @param that line_iterator to copy from
line_iterator(line_iterator<OutputType> const& that)
@ -100,27 +102,22 @@ public:
, width(that.width)
{
}
OutputType const& operator*() const {
return value;
}
OutputType const* operator->() const {
return &value;
}
OutputType const& operator*() const { return value; }
OutputType const* operator->() const { return &value; }
line_iterator<OutputType>& operator++() {
next();
return *this;
}
line_iterator<OutputType> operator++(int) {
line_iterator<OutputType> tmp(*this);
++(*this);
++*this;
return tmp;
}
bool operator==(line_iterator<OutputType> const& rgt) const {
return valid == rgt.valid;
}
bool operator!=(line_iterator<OutputType> const& rgt) const {
return !operator==(rgt);
}
bool operator==(line_iterator<OutputType> const& rgt) const { return valid == rgt.valid; }
bool operator!=(line_iterator<OutputType> const& rgt) const { return !operator==(rgt); }
// typedefs needed by some stl algorithms
typedef OutputType* pointer;
@ -133,6 +130,7 @@ public:
swap(*this, that);
return *this;
}
void swap(line_iterator<OutputType> &that) throw() {
using std::swap;
swap(stream, that.stream);