X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=e6fb52fd7dd0d589342ed877ee573cbb572a4755;hb=35750e4dc619d538f105ed024f3a72b630108234;hp=0b503e056a83f6bc471aaf3c14612e3682cbbb97;hpb=e71eb81c946c3524e01eaef9781ccbf170143d0c;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 0b503e0..e6fb52f 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#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>
 
@@ -217,13 +222,9 @@ set< shared_ptr<data::SignalData> > Session::get_data() const
 	return data;
 }
 
-boost::shared_mutex& Session::signals_mutex() const
-{
-	return signals_mutex_;
-}
-
-const unordered_set< shared_ptr<view::Signal> >& Session::signals() const
+const unordered_set< shared_ptr<view::Signal> > Session::signals() const
 {
+	shared_lock<shared_mutex> lock(signals_mutex_);
 	return signals_;
 }
 
@@ -525,7 +526,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
 	const size_t sample_count = analog->num_samples() / channel_count;
-	const float *data = analog->data_pointer();
+	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
 	for (auto channel : channels)