From 9663cfd4aecc5bd8b7c1a96183372ce5f6e30a84 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Wed, 5 Jun 2013 07:46:48 +0200 Subject: [PATCH] burst tagger: check value in constructor, make tags static --- lib/burst_tagger_impl.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/burst_tagger_impl.cc b/lib/burst_tagger_impl.cc index eb9ccbf..e6a7630 100644 --- a/lib/burst_tagger_impl.cc +++ b/lib/burst_tagger_impl.cc @@ -33,6 +33,10 @@ burst_tagger_impl::burst_tagger_impl(pmt::pmt_t tag_name, d_tag_name(tag_name), d_copy(0), d_mult(mult) { + + if(!d_mult) { + throw std::out_of_range("multiplier must be > 0"); + } } burst_tagger_impl::~burst_tagger_impl() { @@ -42,9 +46,9 @@ void burst_tagger_impl::add_sob(uint64_t item) { GR_LOG_DEBUG(d_debug_log, boost::format("insert tx_sob at item %1%") % item); - const pmt::pmt_t sob_key = pmt::string_to_symbol("tx_sob"); - const pmt::pmt_t value = pmt::PMT_T; - const pmt::pmt_t srcid = pmt::string_to_symbol(alias()); + static const pmt::pmt_t sob_key = pmt::string_to_symbol("tx_sob"); + static const pmt::pmt_t value = pmt::PMT_T; + static const pmt::pmt_t srcid = pmt::string_to_symbol(alias()); add_item_tag(0, item, sob_key, value, srcid); } @@ -53,9 +57,9 @@ void burst_tagger_impl::add_eob(uint64_t item) { GR_LOG_DEBUG(d_debug_log, boost::format("insert tx_eob at item %1%") % item); - const pmt::pmt_t eob_key = pmt::string_to_symbol("tx_eob"); - const pmt::pmt_t value = pmt::PMT_T; - const pmt::pmt_t srcid = pmt::string_to_symbol(alias()); + static const pmt::pmt_t eob_key = pmt::string_to_symbol("tx_eob"); + static const pmt::pmt_t value = pmt::PMT_T; + static const pmt::pmt_t srcid = pmt::string_to_symbol(alias()); add_item_tag(0, item, eob_key, value, srcid); }