X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitemiterator.hpp;h=91ace4e90d9c710e84219572650d2f8e045f8ab8;hp=c4c6f2afd7923c60e0948a02af4a1128458a8d60;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=00f6bae935837b38b0d03a5928ba8175d460413f diff --git a/pv/view/viewitemiterator.hpp b/pv/view/viewitemiterator.hpp index c4c6f2a..91ace4e 100644 --- a/pv/view/viewitemiterator.hpp +++ b/pv/view/viewitemiterator.hpp @@ -30,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 { @@ -38,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) : @@ -68,9 +73,6 @@ public: } ViewItemIterator& operator++() { - using std::dynamic_pointer_cast; - using std::shared_ptr; - assert(!owner_stack_.empty()); assert(!iter_stack_.empty()); @@ -113,8 +115,8 @@ public: } private: - std::stack owner_stack_; - std::stack iter_stack_; + stack owner_stack_; + stack iter_stack_; }; template