projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce include bloat by including boost/thread/{locks,shared_mutex}.hpp directly
[pulseview.git]
/
pv
/
view
/
rowitemiterator.hpp
diff --git
a/pv/view/rowitemiterator.hpp
b/pv/view/rowitemiterator.hpp
index c45507bbb3de46a2545ead04b2d33df1e0d01e4c..10de80a03060bde9323eb4e549ff1aede26b4a49 100644
(file)
--- a/
pv/view/rowitemiterator.hpp
+++ b/
pv/view/rowitemiterator.hpp
@@
-29,7
+29,13
@@
#include <type_traits>
#include <vector>
#include <type_traits>
#include <vector>
-#include <boost/thread.hpp>
+#ifdef _WIN32
+// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
#include <pv/session.hpp>
#include <pv/session.hpp>