projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop unused boost-thread dependency.
[pulseview.git]
/
pv
/
view
/
viewitemiterator.hpp
diff --git
a/pv/view/viewitemiterator.hpp
b/pv/view/viewitemiterator.hpp
index c4c6f2afd7923c60e0948a02af4a1128458a8d60..91ace4e90d9c710e84219572650d2f8e045f8ab8 100644
(file)
--- a/
pv/view/viewitemiterator.hpp
+++ b/
pv/view/viewitemiterator.hpp
@@
-30,6
+30,11
@@
#include <pv/session.hpp>
#include <pv/session.hpp>
+using std::dynamic_pointer_cast;
+using std::forward_iterator_tag;
+using std::shared_ptr;
+using std::stack;
+
namespace pv {
namespace views {
namespace TraceView {
namespace pv {
namespace views {
namespace TraceView {
@@
-38,11
+43,11
@@
template<class Owner, class Item> class ViewItemIterator
{
public:
typedef typename Owner::item_list::const_iterator child_iterator;
{
public:
typedef typename Owner::item_list::const_iterator child_iterator;
- typedef s
td::s
hared_ptr<Item> value_type;
+ typedef shared_ptr<Item> value_type;
typedef ptrdiff_t difference_type;
typedef value_type pointer;
typedef const value_type& reference;
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) :
public:
ViewItemIterator(Owner *owner) :
@@
-68,9
+73,6
@@
public:
}
ViewItemIterator<Owner, Item>& operator++() {
}
ViewItemIterator<Owner, Item>& operator++() {
- using std::dynamic_pointer_cast;
- using std::shared_ptr;
-
assert(!owner_stack_.empty());
assert(!iter_stack_.empty());
assert(!owner_stack_.empty());
assert(!iter_stack_.empty());
@@
-113,8
+115,8
@@
public:
}
private:
}
private:
- st
d::st
ack<Owner*> owner_stack_;
- st
d::st
ack<child_iterator> iter_stack_;
+ stack<Owner*> owner_stack_;
+ stack<child_iterator> iter_stack_;
};
template<class Owner, class Item>
};
template<class Owner, class Item>