#include <cassert>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include "storesession.hpp"
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
#include <pv/data/analog.hpp>
#include <pv/data/analogsegment.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
#include <pv/devices/device.hpp>
+#include <pv/session.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
// Qt needs the progress values to fit inside an int. If they would
// not, scale the current and max values down until they do.
while ((sample_count_ >> progress_scale) > INT_MAX)
- progress_scale ++;
+ progress_scale++;
unit_count_ = sample_count_ >> progress_scale;
output_stream_.close();
}
-} // pv
+} // namespace pv