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

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 3d303da47f198a6b3f88d046298126b4d5453270..2eb4f630fd3be357161272f3b1ae60028390ce1b 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,11 +31,11 @@
 #include <vector>
 
 #ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
@@ -114,9 +114,7 @@ public:
 
        std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-       boost::shared_mutex& signals_mutex() const;
-
-       const std::unordered_set< std::shared_ptr<view::Signal> >&
+       const std::unordered_set< std::shared_ptr<view::Signal> >
                signals() const;
 
 #ifdef ENABLE_DECODE