Session: Removed signals_mutex(), and made signals() return a copy not a reference

[pulseview.git] / pv / view / rowitemiterator.hpp

diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp
index 110dc57418f0a280d8e050941993971b6138c1a8..d75b834d9f4a28179beff69a2776021934cd71a8 100644 (file)
--- a/pv/view/rowitemiterator.hpp
+++ b/pv/view/rowitemiterator.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
-#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP
+#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP

 
 #include <algorithm>
 #include <cassert>
 
 #include <algorithm>
 #include <cassert>


@@ -29,9 +29,7 @@
 #include <type_traits>
 #include <vector>
 
 #include <type_traits>
 #include <vector>
 

-#include <boost/thread.hpp>
-
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>

 
 namespace pv {
 namespace view {
 
 namespace pv {
 namespace view {


@@ -51,12 +49,10 @@ public:
 
 public:
        RowItemIterator(Owner *owner) :
 
 public:
        RowItemIterator(Owner *owner) :

-               owner_(owner),
-               lock_(owner->session().signals_mutex()) {}
+               owner_(owner) {}

 
        RowItemIterator(Owner *owner, child_iterator iter) :
 
        RowItemIterator(Owner *owner, child_iterator iter) :

-               owner_(owner),
-               lock_(owner->session().signals_mutex()) {
+               owner_(owner) {

                assert(owner);
                if (iter != owner->child_items().end())
                        iter_stack_.push(iter);
                assert(owner);
                if (iter != owner->child_items().end())
                        iter_stack_.push(iter);


@@ -64,7 +60,6 @@ public:
 
        RowItemIterator(const RowItemIterator<Owner, Item> &o) :
                owner_(o.owner_),
 
        RowItemIterator(const RowItemIterator<Owner, Item> &o) :
                owner_(o.owner_),

-               lock_(*o.lock_.mutex()),

                iter_stack_(o.iter_stack_) {}
 
        reference operator*() const {
                iter_stack_(o.iter_stack_) {}
 
        reference operator*() const {


@@ -127,7 +122,6 @@ public:
 
 private:
        Owner *owner_;
 
 private:
        Owner *owner_;

-       boost::shared_lock<boost::shared_mutex> lock_;

        std::stack<child_iterator> iter_stack_;
 };
 
        std::stack<child_iterator> iter_stack_;
 };
 


@@ -140,4 +134,4 @@ void swap(RowItemIterator<Owner, Item>& a, RowItemIterator<Owner, Item>& b)
 } // namespace view
 } // namespace pv
 
 } // namespace view
 } // namespace pv
 

-#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP