Fix include guards and accidential const removal

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 6ab7a50b899aa311b8e26a8e4e767d7ea2ee9cdb..1a91b8b7a411eaeca048f1a3065e1d4045c8e923 100644 (file)
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
-#define PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
+#ifndef PULSEVIEW_PV_DATA_ANALOGSEGMENT_HPP
+#define PULSEVIEW_PV_DATA_ANALOGSEGMENT_HPP
 
 #include "segment.hpp"
 
@@ -93,4 +93,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_HPP
+#endif // PULSEVIEW_PV_DATA_ANALOGSEGMENT_HPP

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 9d07d203e3b6d64b88e15898b5771b1bfef82e33..6f19c1cb28e3bb58f65ef712e6112541ae78762b 100644 (file)
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
-#define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
+#ifndef PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
+#define PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
 
 #include "segment.hpp"
 
@@ -116,4 +116,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
+#endif // PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP

diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index bfb10292f47172edaf1e9cbf4739eb0cc55e8e22..97dd47237cbe65aa28db8a87d8d6f4eaa323397b 100644 (file)
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_SNAPSHOT_HPP
-#define PULSEVIEW_PV_DATA_SNAPSHOT_HPP
+#ifndef PULSEVIEW_PV_DATA_SEGMENT_HPP
+#define PULSEVIEW_PV_DATA_SEGMENT_HPP
 
 #include <thread>
 #include <mutex>
@@ -87,4 +87,4 @@ protected:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_SNAPSHOT_HPP
+#endif // PULSEVIEW_PV_DATA_SEGMENT_HPP

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index a3d745b387834e4f76a2516164ca0aa48540125e..aa2902375e02bd84e479d382b20e1ab32e4e3951 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -92,7 +92,7 @@ const QString& StoreSession::error() const
 bool StoreSession::start()
 {
        shared_lock<shared_mutex> lock(session_.signals_mutex());
-       unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+       const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
 
        // Add enabled channels to the data set
        set< shared_ptr<data::SignalData> > data_set;