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

[pulseview.git] / pv / popups / channels.cpp

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 3ad494d31660fb17953ad8e7b110f4221868d79b..bffd0dfefbb15e6182b6c4ed54ee5ae9ac3dbd27 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,14 @@
 
 #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>
+
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -72,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;
@@ -110,7 +117,7 @@ Channels::Channels(Session &session, QWidget *parent) :
        }
 
        // Create a group
-       populate_group(NULL, global_sigs);
+       populate_group(nullptr, global_sigs);
 
        // Create the enable/disable all buttons
        connect(&enable_all_channels_, SIGNAL(clicked()),
@@ -200,7 +207,7 @@ QGridLayout* Channels::create_channel_group_grid(
 
                check_box_signal_map_[checkbox] = sig;
 
-               if(++col >= 8)
+               if (++col >= 8)
                        col = 0, row++;
        }