X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hp=0fef9c91764bc75366bc8db57cfd6880783465b3;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 0fef9c9..31ca328 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,12 +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
@@ -31,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"
@@ -810,7 +804,7 @@ void Session::update_signals()
}
default:
- assert(0);
+ assert(false);
break;
}
}
@@ -859,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
@@ -1035,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;