projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
101e7a9
)
Session: Fix include order
author
Soeren Apel
<soeren@apelpie.net>
Sat, 27 Aug 2016 19:58:48 +0000
(21:58 +0200)
committer
Soeren Apel
<soeren@apelpie.net>
Sat, 27 Aug 2016 19:58:48 +0000
(21:58 +0200)
pv/session.cpp
patch
|
blob
|
history
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 99de77495307386a01be90099c6a6a28402871f5..b18d27ff9e8065f796b8434c21808a5568130737 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-26,12
+26,13
@@
#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
-#i
fdef ENABLE_DECODE
-#include <
libsigrokdecode/libsigrokdecode.h
>
-#
endif
+#i
nclude <cassert>
+#include <
mutex
>
+#
include <stdexcept>
-#include
"session.hpp"
+#include
<sys/stat.h>
+#include "session.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
@@
-53,16
+54,12
@@
#include "view/signal.hpp"
#include "view/view.hpp"
#include "view/signal.hpp"
#include "view/view.hpp"
-#include <cassert>
-#include <mutex>
-#include <stdexcept>
-
-#include <sys/stat.h>
-
-#include <QDebug>
-
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;