projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: Re-fix the Windows build (namespace pollution via windows.h).
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 59060a591fdfd0d743ad83780dbcd066cdefbc01..2eb4f630fd3be357161272f3b1ae60028390ce1b 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-31,11
+31,11
@@
#include <vector>
#ifdef _WIN32
#include <vector>
#ifdef _WIN32
-// Windows: Avoid
namespace pollution by thread.hpp
(which includes windows.h).
+// Windows: Avoid
boost/thread namespace pollution
(which includes windows.h).
#define NOGDI
#define NORESOURCE
#endif
#define NOGDI
#define NORESOURCE
#endif
-#include <boost/thread.hpp>
+#include <boost/thread
/shared_mutex
.hpp>
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
@@
-114,9
+114,7
@@
public:
std::set< std::shared_ptr<data::SignalData> > get_data() const;
std::set< std::shared_ptr<data::SignalData> > get_data() const;
- boost::shared_mutex& signals_mutex() const;
-
- const std::unordered_set< std::shared_ptr<view::Signal> >&
+ const std::unordered_set< std::shared_ptr<view::Signal> >
signals() const;
#ifdef ENABLE_DECODE
signals() const;
#ifdef ENABLE_DECODE
@@
-174,6
+172,8
@@
private:
std::thread sampling_thread_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();