X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitemiterator.hpp;h=d75b834d9f4a28179beff69a2776021934cd71a8;hp=1b8926ca90a0d35a2df9c20b6d44cf0165f57393;hb=bf9146988d2298e1750142dccdcf597ef13d6606;hpb=627ffe3f3a5d0a8f38e35668bd4ed71321f09b91 diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp index 1b8926ca..d75b834d 100644 --- a/pv/view/rowitemiterator.hpp +++ b/pv/view/rowitemiterator.hpp @@ -29,13 +29,6 @@ #include #include -#ifdef _WIN32 -// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include - #include namespace pv { @@ -56,12 +49,10 @@ public: 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); @@ -69,7 +60,6 @@ public: RowItemIterator(const RowItemIterator &o) : owner_(o.owner_), - lock_(*o.lock_.mutex()), iter_stack_(o.iter_stack_) {} reference operator*() const { @@ -132,7 +122,6 @@ public: private: Owner *owner_; - boost::shared_lock lock_; std::stack iter_stack_; };