Skip to content
Snippets Groups Projects
Commit c1694c40 authored by g0dil's avatar g0dil
Browse files

Utils/Console: Fix rename Target::clear() to Target::flush() to fix name clash...

Utils/Console: Fix rename Target::clear() to Target::flush() to fix name clash (Target / StringTarget)
parent 83d33cfa
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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_ &&
......
......@@ -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,
......
......@@ -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////////////////////////////////////////
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment