X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=c7c2edb0b4eace1e1fcf290770527b35ac6d12fb;hb=35750e4dc619d538f105ed024f3a72b630108234;hp=9a30c24379b37a691af0750640997211ee725603;hpb=542f1e6c4ac755f5ef79b2c01e099ce69a1e8520;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9a30c24..c7c2edb 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,14 @@
 
 #include <cassert>
 
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include "storesession.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -92,8 +100,7 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
 
 	// Add enabled channels to the data set
 	set< shared_ptr<data::SignalData> > data_set;