X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=bffd0dfefbb15e6182b6c4ed54ee5ae9ac3dbd27;hb=a009d21992db132679e27030736ed614522245ea;hp=3cf2ff40ae2591333519367bb03b9cc6e70a3a95;hpb=e71eb81c946c3524e01eaef9781ccbf170143d0c;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 3cf2ff4..bffd0df 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,11 @@
 
 #include <map>
 
+#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>
 
@@ -75,8 +80,7 @@ Channels::Channels(Session &session, QWidget *parent) :
 	// Collect a set of signals
 	map<shared_ptr<Channel>, shared_ptr<Signal> > signal_map;
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
 
 	for (const shared_ptr<Signal> &sig : sigs)
 		signal_map[sig->channel()] = sig;