diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc index a277dd58203fb280747583abdb3387c2483f9de7..75927e2b661c6a87b7964ff00e01ed39d3b5a59f 100644 --- a/Utils/Logger/Target.cc +++ b/Utils/Logger/Target.cc @@ -120,7 +120,7 @@ prefix_ void senf::log::Target::clear() RIB::const_iterator const i_end (old.end()); for (; i != i_end; ++i) if (i->action_ == ACCEPT) - updateRoutingCache(i->stream_, i->area_) + updateRoutingCache(i->stream_, i->area_); } //////////////////////////////////////// diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci index 60279399763d42383a80c92147c50a7c96d69330..014f64cd5b5848a21f436c6c53269d4883e04537 100644 --- a/Utils/Logger/Target.cci +++ b/Utils/Logger/Target.cci @@ -56,14 +56,14 @@ prefix_ senf::log::Target::iterator senf::log::Target::end() return rib_.end(); } -prefix_ RoutingEntry const & senf::log::Target::operator[](size_type i) - size_type size() const +prefix_ senf::log::Target::RoutingEntry const & senf::log::Target::operator[](size_type i) + const { return rib_[i]; } -prefix_ RoutingEntry const & senf::log::Target::operator[](size_type i) - size_type size() const +prefix_ senf::log::Target::size_type senf::log::Target::size() + const { return rib_.size(); } diff --git a/Utils/Logger/Target.hh b/Utils/Logger/Target.hh index e969f1a8f326ab5120e39233c03743207661495a..502bae810eb68fa6076b41b51181bc20935a3971 100644 --- a/Utils/Logger/Target.hh +++ b/Utils/Logger/Target.hh @@ -333,7 +333,7 @@ namespace log { iterator begin() const; ///< Iterator to beginning of routing table iterator end() const; ///< Iterator past the end of routing table - RoutingEntry const & operator[](size_type i) ///< Access routing entry + RoutingEntry const & operator[](size_type i) const; ///< Access routing entry size_type size() const; ///< Number of routing table entries bool empty() const; ///< \c true, if routing table empty, \c false otherwise diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc index cdcaed1566572625bfa0eb1289c181ce32e97e2d..b19f03f378227964f6153ef6c9800b2cd0ef6721 100644 --- a/Utils/Logger/Target.test.cc +++ b/Utils/Logger/Target.test.cc @@ -86,17 +86,19 @@ BOOST_AUTO_UNIT_TEST(target) }; BOOST_CHECK_EQUAL_COLLECTIONS( i, i_end, data, data + sizeof(data)/sizeof(data[0]) ); + BOOST_CHECK_EQUAL( *target.begin(), target[0] ); target.unroute<senf::log::Debug>(); target.unroute<senf::log::test::myStream, senf::log::VERBOSE>(); target.unroute<senf::log::test::myStream, senf::log::DefaultArea>(senf::log::Target::REJECT); - target.unroute<senf::log::test::myStream, senf::log::test::Foo, senf::log::VERBOSE>(); target.unroute("senf::log::test::myStream", "", senf::log::IMPORTANT::value, senf::log::Target::REJECT); target.unroute(1); - target.unroute(0); + target.clear(); BOOST_CHECK( target.begin() == target.end() ); + BOOST_CHECK( target.empty() ); + BOOST_CHECK( target.size() == 0 ); } ///////////////////////////////cc.e////////////////////////////////////////