X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=388c4c49ec75e00f35fac366366bef960823a87c;hb=a2321722dc5a2bade721a73551014908aff4cb4c;hp=305031ebd466c9a0b699e4641fa8b6639b8c5e5c;hpb=2c25d912f97ca7bedd9c03f4827fe8d8a189e8bc;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 305031e..388c4c4 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,6 +43,7 @@
 #include "pv/data/logicsnapshot.h"
 
 using pv::data::SignalData;
+using std::back_inserter;
 using std::deque;
 using std::list;
 using std::max;
@@ -242,21 +243,16 @@ void View::set_scale_offset(double scale, double offset)
 
 vector< shared_ptr<Trace> > View::get_traces() const
 {
+	vector< shared_ptr<Trace> > traces;
+
 	const vector< shared_ptr<Signal> > sigs(
 		session().get_signals());
+	copy(sigs.begin(), sigs.end(), back_inserter(traces));
+
 #ifdef ENABLE_DECODE
 	const vector< shared_ptr<DecodeTrace> > decode_sigs(
 		session().get_decode_signals());
-	vector< shared_ptr<Trace> > traces(
-		sigs.size() + decode_sigs.size());
-#else
-	vector< shared_ptr<Trace> > traces(sigs.size());
-#endif
-
-	auto i = traces.begin();
-	i = copy(sigs.begin(), sigs.end(), i);
-#ifdef ENABLE_DECODE
-	i = copy(decode_sigs.begin(), decode_sigs.end(), i);
+	copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces));
 #endif
 
 	stable_sort(traces.begin(), traces.end(),