projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add missing check for glib.
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 0fef9c91764bc75366bc8db57cfd6880783465b3..31ca328deca53bf1c9cfd90d426fb228da228af6 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-17,12
+17,6
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include <QFileInfo>
#include <cassert>
#include <QFileInfo>
#include <cassert>
@@
-31,16
+25,16
@@
#include <sys/stat.h>
#include <sys/stat.h>
-#include "session.hpp"
#include "devicemanager.hpp"
#include "devicemanager.hpp"
+#include "session.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.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/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"
#include "devices/hardwaredevice.hpp"
#include "devices/inputfile.hpp"
@@
-810,7
+804,7
@@
void Session::update_signals()
}
default:
}
default:
- assert(
0
);
+ assert(
false
);
break;
}
}
break;
}
}
@@
-859,7
+853,7
@@
void Session::sample_thread_proc(function<void (const QString)> error_handler)
// Confirm that SR_DF_END was received
if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
// 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
}
// Optimize memory usage
@@
-1035,7
+1029,7
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
- static bool frame_began
=
false;
+ static bool frame_began
=
false;
(void)device;
(void)device;