win32: Re-fix the Windows build (namespace pollution via windows.h).

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9a30c24379b37a691af0750640997211ee725603..c7c2edb0b4eace1e1fcf290770527b35ac6d12fb 100644 (file)
--- 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;