X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewitemiterator.hpp;h=91ace4e90d9c710e84219572650d2f8e045f8ab8;hb=12ea3616767553ee0a615f14bbcb8ec614589e34;hp=403b196bfd4b8848eb9d65fd02d53320d8c71e72;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/viewitemiterator.hpp b/pv/view/viewitemiterator.hpp
index 403b196..91ace4e 100644
--- a/pv/view/viewitemiterator.hpp
+++ b/pv/view/viewitemiterator.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
@@ -31,6 +30,11 @@
#include
+using std::dynamic_pointer_cast;
+using std::forward_iterator_tag;
+using std::shared_ptr;
+using std::stack;
+
namespace pv {
namespace views {
namespace TraceView {
@@ -39,11 +43,11 @@ template class ViewItemIterator
{
public:
typedef typename Owner::item_list::const_iterator child_iterator;
- typedef std::shared_ptr- value_type;
+ typedef shared_ptr
- value_type;
typedef ptrdiff_t difference_type;
typedef value_type pointer;
typedef const value_type& reference;
- typedef std::forward_iterator_tag iterator_category;
+ typedef forward_iterator_tag iterator_category;
public:
ViewItemIterator(Owner *owner) :
@@ -69,9 +73,6 @@ public:
}
ViewItemIterator& operator++() {
- using std::dynamic_pointer_cast;
- using std::shared_ptr;
-
assert(!owner_stack_.empty());
assert(!iter_stack_.empty());
@@ -114,8 +115,8 @@ public:
}
private:
- std::stack owner_stack_;
- std::stack iter_stack_;
+ stack owner_stack_;
+ stack iter_stack_;
};
template