* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_SIGSESSION_HPP
-#define PULSEVIEW_PV_SIGSESSION_HPP
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
#include <map>
#include <memory>
#include <set>
#include <string>
#include <thread>
+#include <unordered_set>
#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 <QObject>
boost::shared_mutex& signals_mutex() const;
- const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+ const std::unordered_set< std::shared_ptr<view::Signal> >&
+ signals() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
- std::vector< std::shared_ptr<view::Signal> > signals_;
+ std::unordered_set< std::shared_ptr<view::Signal> > signals_;
mutable std::mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
} // namespace pv
-#endif // PULSEVIEW_PV_SIGSESSION_HPP
+#endif // PULSEVIEW_PV_SESSION_HPP