projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Device: Make capability listing more robust
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 4ac7f509b516dcf18b4738753b1dd5038041f6ec..c7e1699bbac1193342e35e81df919be33b7fcfe6 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-29,13
+29,6
@@
#include <unordered_set>
#include <vector>
#include <unordered_set>
#include <vector>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/shared_mutex.hpp>
-
#include <QObject>
#include <QSettings>
#include <QString>
#include <QObject>
#include <QSettings>
#include <QString>
@@
-65,7
+58,7
@@
class Meta;
class OutputFormat;
class Packet;
class Session;
class OutputFormat;
class Packet;
class Session;
-}
+}
// namespace sigrok
namespace pv {
namespace pv {
@@
-170,8
+163,7
@@
public:
bool has_view(shared_ptr<views::ViewBase> view);
bool has_view(shared_ptr<views::ViewBase> view);
- const unordered_set< shared_ptr<data::SignalBase> >
- signalbases() const;
+ const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);