projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler scale calculation optimization
[pulseview.git]
/
pv
/
view
/
rowitemiterator.hpp
diff --git
a/pv/view/rowitemiterator.hpp
b/pv/view/rowitemiterator.hpp
index 110dc57418f0a280d8e050941993971b6138c1a8..1b8926ca90a0d35a2df9c20b6d44cf0165f57393 100644
(file)
--- a/
pv/view/rowitemiterator.hpp
+++ b/
pv/view/rowitemiterator.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
-#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#ifndef PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
PP
+#define PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
PP
#include <algorithm>
#include <cassert>
#include <algorithm>
#include <cassert>
@@
-29,9
+29,14
@@
#include <type_traits>
#include <vector>
#include <type_traits>
#include <vector>
+#ifdef _WIN32
+// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
#include <boost/thread.hpp>
#include <boost/thread.hpp>
-#include <pv/s
igs
ession.hpp>
+#include <pv/session.hpp>
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-140,4
+145,4
@@
void swap(RowItemIterator<Owner, Item>& a, RowItemIterator<Owner, Item>& b)
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
+#endif // PULSEVIEW_PV_VIEW_ROWITEMITERATOR_H
PP