From 83d33cfa9406c4056ed5b4bf86cfcee7262a6acf Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 3 Feb 2009 10:54:49 +0000
Subject: [PATCH] I'm too tired ??
---
Utils/Logger/Target.cc | 2 +-
Utils/Logger/Target.cci | 8 ++++----
Utils/Logger/Target.hh | 2 +-
Utils/Logger/Target.test.cc | 6 ++++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc
index a277dd582..75927e2b6 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 602793997..014f64cd5 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 e969f1a8f..502bae810 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 cdcaed156..b19f03f37 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////////////////////////////////////////
--
GitLab