X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.hpp;h=2eb4f630fd3be357161272f3b1ae60028390ce1b;hb=812c0e3592e51946947b55c54b906bf4a0cb30e9;hp=59060a591fdfd0d743ad83780dbcd066cdefbc01;hpb=b48daed65bff5da5fddc6db11377b8730220865f;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 59060a59..2eb4f630 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,11 +31,11 @@
 #include <vector>
 
 #ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
@@ -114,9 +114,7 @@ public:
 
 	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	boost::shared_mutex& signals_mutex() const;
-
-	const std::unordered_set< std::shared_ptr<view::Signal> >&
+	const std::unordered_set< std::shared_ptr<view::Signal> >
 		signals() const;
 
 #ifdef ENABLE_DECODE
@@ -174,6 +172,8 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+
 Q_SIGNALS:
 	void capture_state_changed(int state);
 	void device_selected();