projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1b8926ca90a0d35a2df9c20b6d44cf0165f57393..d75b834d9f4a28179beff69a2776021934cd71a8 100644
(file)
--- a/
pv/view/rowitemiterator.hpp
+++ b/
pv/view/rowitemiterator.hpp
@@
-29,13
+29,6
@@
#include <type_traits>
#include <vector>
#include <type_traits>
#include <vector>
-#ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread.hpp>
-
#include <pv/session.hpp>
namespace pv {
#include <pv/session.hpp>
namespace pv {
@@
-56,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);
@@
-69,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 {
@@
-132,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_;
};