X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewitemiterator.hpp;h=403b196bfd4b8848eb9d65fd02d53320d8c71e72;hb=cbf7b5db5c3c04b95daf77bc0e6dc112c15e0195;hp=179de383965218d2b31321b96b67686ab424f316;hpb=c373f82810ad9c5376a7370118de9dd587ee0e43;p=pulseview.git

diff --git a/pv/view/viewitemiterator.hpp b/pv/view/viewitemiterator.hpp
index 179de383..403b196b 100644
--- a/pv/view/viewitemiterator.hpp
+++ b/pv/view/viewitemiterator.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
-#define PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -32,19 +32,17 @@
 #include <pv/session.hpp>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 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 value_type& reference;
+	typedef const value_type& reference;
 	typedef std::forward_iterator_tag iterator_category;
 
 public:
@@ -126,7 +124,8 @@ void swap(ViewItemIterator<Owner, Item>& a, ViewItemIterator<Owner, Item>& b)
 	a.swap(b);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWITEMITERATOR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMITERATOR_HPP