X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=8922922aa1c1e939f747b15327545acc84c6379e;hb=e4cc0ee6270eb4d388a169438f58aa481f705261;hp=6a9c01af731180378de18a45c9c3e2affe34286d;hpb=d0c0573b3ee694827a747727f862c5f91736ca05;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 6a9c01a..8922922 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -79,7 +79,6 @@ using std::make_pair;
 using std::make_shared;
 using std::min;
 using std::pair;
-using std::placeholders::_1;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
@@ -562,8 +561,10 @@ void View::set_current_segment(uint32_t segment_id)
 
 	for (shared_ptr<Signal> signal : signals_)
 		signal->set_current_segment(current_segment_);
+#ifdef ENABLE_DECODE
 	for (shared_ptr<DecodeTrace> dt : decode_traces_)
 		dt->set_current_segment(current_segment_);
+#endif
 
 	vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
 
@@ -951,7 +952,7 @@ void View::calculate_tick_spacing()
 				(ScaleUnits[unit++] + tp_margin);
 		} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
 
-		minor_tick_count_ = (unit == 2) ? (4) : (5);
+		minor_tick_count_ = (unit == 2) ? 4 : 5;
 		tick_period = order_decimal * ScaleUnits[unit - 1];
 		tick_prefix = static_cast<pv::util::SIPrefix>(
 			(order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3);