projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 35582b43a411d92ced14ba45e3b7a124b320d3a0..c7c2edb0b4eace1e1fcf290770527b35ac6d12fb 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-20,6
+20,11
@@
#include <cassert>
#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 <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
@@
-95,8
+100,7
@@
const QString& StoreSession::error() const
bool StoreSession::start()
{
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;
// Add enabled channels to the data set
set< shared_ptr<data::SignalData> > data_set;