From c1694c40a78a88adc875942d45fca238938fd5b8 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 3 Feb 2009 12:07:30 +0000
Subject: [PATCH] Utils/Console: Fix rename Target::clear() to Target::flush()
to fix name clash (Target / StringTarget)
---
Utils/Logger/Target.cc | 2 +-
Utils/Logger/Target.cci | 1 +
Utils/Logger/Target.hh | 4 ++--
Utils/Logger/Target.test.cc | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc
index 75927e2b6..068631c7d 100644
--- a/Utils/Logger/Target.cc
+++ b/Utils/Logger/Target.cc
@@ -112,7 +112,7 @@ prefix_ void senf::log::Target::unroute(int index)
updateRoutingCache(entry.stream_, entry.area_);
}
-prefix_ void senf::log::Target::clear()
+prefix_ void senf::log::Target::flush()
{
RIB old;
rib_.swap(old);
diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci
index 014f64cd5..10e58ab35 100644
--- a/Utils/Logger/Target.cci
+++ b/Utils/Logger/Target.cci
@@ -88,6 +88,7 @@ prefix_ senf::log::Target::RoutingEntry::RoutingEntry()
{}
prefix_ bool senf::log::Target::RoutingEntry::operator==(RoutingEntry const & other)
+ const
{
return
stream_ == other.stream_ &&
diff --git a/Utils/Logger/Target.hh b/Utils/Logger/Target.hh
index 502bae810..9065ef4c4 100644
--- a/Utils/Logger/Target.hh
+++ b/Utils/Logger/Target.hh
@@ -160,7 +160,7 @@ namespace log {
# endif
RoutingEntry();
- bool operator==(RoutingEntry const & other);
+ bool operator==(RoutingEntry const & other) const;
private:
RoutingEntry(detail::StreamBase const * stream, detail::AreaBase const * area,
@@ -338,7 +338,7 @@ namespace log {
size_type size() const; ///< Number of routing table entries
bool empty() const; ///< \c true, if routing table empty, \c false otherwise
- void clear(); ///< Clear routing table
+ void flush(); ///< Clear routing table
private:
void route(detail::StreamBase const * stream, detail::AreaBase const * area,
diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc
index b19f03f37..090af84c8 100644
--- a/Utils/Logger/Target.test.cc
+++ b/Utils/Logger/Target.test.cc
@@ -86,7 +86,7 @@ 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] );
+ BOOST_CHECK( *target.begin() == target[0] );
target.unroute<senf::log::Debug>();
target.unroute<senf::log::test::myStream, senf::log::VERBOSE>();
@@ -94,11 +94,11 @@ BOOST_AUTO_UNIT_TEST(target)
target.unroute("senf::log::test::myStream", "", senf::log::IMPORTANT::value,
senf::log::Target::REJECT);
target.unroute(1);
- target.clear();
+ target.flush();
BOOST_CHECK( target.begin() == target.end() );
BOOST_CHECK( target.empty() );
- BOOST_CHECK( target.size() == 0 );
+ BOOST_CHECK_EQUAL( target.size(), 0u );
}
///////////////////////////////cc.e////////////////////////////////////////
--
GitLab