Session: Fixed header guard

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 8f1860dc466b4622a5fc4e9e35891b445e5947a5..f5c87f694f8e22a574307e7ae3568968423df9e8 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.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_SIGSESSION_H
-#define PULSEVIEW_PV_SIGSESSION_H
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP

 
 #include <map>
 #include <memory>
 
 #include <map>
 #include <memory>


@@ -27,8 +27,14 @@
 #include <set>
 #include <string>
 #include <thread>
 #include <set>
 #include <string>
 #include <thread>

+#include <unordered_set>

 #include <vector>
 
 #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>
 #include <boost/thread.hpp>
 
 #include <QObject>


@@ -112,7 +118,8 @@ public:
 
        boost::shared_mutex& signals_mutex() const;
 
 
        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);
 
 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);


@@ -166,7 +173,7 @@ private:
        capture_state capture_state_;
 
        mutable boost::shared_mutex signals_mutex_;
        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_;
 
        mutable std::mutex data_mutex_;
        std::shared_ptr<data::Logic> logic_data_;


@@ -192,4 +199,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
 
 } // namespace pv
 

-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SESSION_HPP