From a38268f064687eff3e5395da6bb7f39e55dcd60f Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Thu, 6 Aug 2015 20:44:13 +0200
Subject: [PATCH] Fix include guards and accidential const removal

---
 pv/data/analogsegment.hpp | 6 +++---
 pv/data/logicsegment.hpp  | 6 +++---
 pv/data/segment.hpp       | 6 +++---
 pv/storesession.cpp       | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 6ab7a50b..1a91b8b7 100644
--- 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 9d07d203..6f19c1cb 100644
--- 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 bfb10292..97dd4723 100644
--- 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 a3d745b3..aa290237 100644
--- 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;
-- 
2.30.2