X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=cb643682d57023462e38cc8dbd228bcd2182a353;hp=3c5d899f2ce71a410a5e8845dbecbb703d2389e1;hb=ebe0a19686181a2ca873219fce38217856b5d82c;hpb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 3c5d899f..cb643682 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -19,32 +19,20 @@
 
 #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 "storesession.hpp"
 
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
 #include <pv/devices/device.hpp>
+#include <pv/session.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using boost::shared_lock;
-using boost::shared_mutex;
-
 using std::deque;
-using std::dynamic_pointer_cast;
 using std::ios_base;
 using std::lock_guard;
 using std::make_pair;
@@ -52,7 +40,6 @@ using std::map;
 using std::min;
 using std::mutex;
 using std::pair;
-using std::set;
 using std::shared_ptr;
 using std::string;
 using std::unordered_set;
@@ -233,7 +220,7 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 	// Qt needs the progress values to fit inside an int. If they would
 	// not, scale the current and max values down until they do.
 	while ((sample_count_ >> progress_scale) > INT_MAX)
-		progress_scale ++;
+		progress_scale++;
 
 	unit_count_ = sample_count_ >> progress_scale;
 
@@ -302,4 +289,4 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 	output_stream_.close();
 }
 
-} // pv
+}  // namespace pv