projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: add check for explicit linking against libatomic
[pulseview.git]
/
pv
/
view
/
viewitemiterator.hpp
diff --git
a/pv/view/viewitemiterator.hpp
b/pv/view/viewitemiterator.hpp
index 179de383965218d2b31321b96b67686ab424f316..eed67a939e1c63b683dec71c6d2b42eaeeef3302 100644
(file)
--- a/
pv/view/viewitemiterator.hpp
+++ b/
pv/view/viewitemiterator.hpp
@@
-37,14
+37,11
@@
namespace view {
template<class Owner, class Item> class ViewItemIterator
{
public:
template<class Owner, class Item> class ViewItemIterator
{
public:
- typedef typename std::conditional<std::is_const<Owner>::value,
- typename Owner::item_list::const_iterator,
- typename Owner::item_list::iterator>::type child_iterator;
-
+ typedef typename Owner::item_list::const_iterator child_iterator;
typedef std::shared_ptr<Item> value_type;
typedef ptrdiff_t difference_type;
typedef value_type pointer;
typedef std::shared_ptr<Item> value_type;
typedef ptrdiff_t difference_type;
typedef value_type pointer;
- typedef value_type& reference;
+ typedef
const
value_type& reference;
typedef std::forward_iterator_tag iterator_category;
public:
typedef std::forward_iterator_tag iterator_category;
public: