* 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 <type_traits>
#include <vector>
-#include <boost/thread.hpp>
-
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
namespace pv {
namespace view {
public:
RowItemIterator(Owner *owner) :
- owner_(owner),
- lock_(owner->session().signals_mutex()) {}
+ owner_(owner) {}
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);
RowItemIterator(const RowItemIterator<Owner, Item> &o) :
owner_(o.owner_),
- lock_(*o.lock_.mutex()),
iter_stack_(o.iter_stack_) {}
reference operator*() const {
private:
Owner *owner_;
- boost::shared_lock<boost::shared_mutex> lock_;
std::stack<child_iterator> iter_stack_;
};
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_HPP