X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hb=93cc1067d3b87a5f5dda6a5ee7dcf83d179c9b6b;hp=a1a078788c4e49631e7d00df1ab5e82646a6cbe3;hpb=12ea3616767553ee0a615f14bbcb8ec614589e34;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index a1a0787..31ca328 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,14 +17,6 @@
* along with this program; if not, see .
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include
-#include
-
#include
#include
@@ -33,16 +25,16 @@
#include
-#include "session.hpp"
#include "devicemanager.hpp"
+#include "session.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
+#include "data/decode/decoder.hpp"
#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
#include "data/signalbase.hpp"
-#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/inputfile.hpp"
@@ -62,10 +54,6 @@
#include
#endif
-using boost::shared_lock;
-using boost::shared_mutex;
-using boost::unique_lock;
-
using std::bad_alloc;
using std::dynamic_pointer_cast;
using std::find_if;
@@ -81,7 +69,6 @@ using std::mutex;
using std::pair;
using std::recursive_mutex;
using std::runtime_error;
-using std::set;
using std::shared_ptr;
using std::string;
using std::unordered_set;
@@ -92,18 +79,13 @@ using sigrok::Channel;
using sigrok::ConfigKey;
using sigrok::DatafeedCallbackFunction;
using sigrok::Error;
-using sigrok::Header;
using sigrok::InputFormat;
using sigrok::Logic;
using sigrok::Meta;
-using sigrok::OutputFormat;
using sigrok::Packet;
-using sigrok::PacketPayload;
using sigrok::Session;
-using sigrok::SessionDevice;
using Glib::VariantBase;
-using Glib::Variant;
namespace pv {
Session::Session(DeviceManager &device_manager, QString name) :
@@ -822,7 +804,7 @@ void Session::update_signals()
}
default:
- assert(0);
+ assert(false);
break;
}
}
@@ -871,7 +853,7 @@ void Session::sample_thread_proc(function error_handler)
// Confirm that SR_DF_END was received
if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
- assert(0);
+ assert(false);
}
// Optimize memory usage
@@ -1047,7 +1029,7 @@ void Session::feed_in_analog(shared_ptr analog)
void Session::data_feed_in(shared_ptr device,
shared_ptr packet)
{
- static bool frame_began=false;
+ static bool frame_began = false;
(void)device;