From dfbf68cd24e017a618dcba1fbfee89413c255cf3 Mon Sep 17 00:00:00 2001 From: Duarte Nunes Date: Sat, 25 Jun 2016 13:07:54 +0200 Subject: [PATCH] commitlog: Define operator<< in namespace db Needed for compilation with gcc6. Signed-off-by: Duarte Nunes Message-Id: <1466852874-8448-1-git-send-email-duarte@scylladb.com> --- db/commitlog/commitlog.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/db/commitlog/commitlog.cc b/db/commitlog/commitlog.cc index acb54ff793..ac23349305 100644 --- a/db/commitlog/commitlog.cc +++ b/db/commitlog/commitlog.cc @@ -1188,18 +1188,22 @@ void db::commitlog::segment_manager::discard_completed_segments( discard_unused_segments(); } -std::ostream& db::operator<<(std::ostream& out, const db::commitlog::segment& s) { +namespace db { + +std::ostream& operator<<(std::ostream& out, const db::commitlog::segment& s) { return out << s._desc.filename(); } -std::ostream& db::operator<<(std::ostream& out, const db::commitlog::segment::cf_mark& m) { +std::ostream& operator<<(std::ostream& out, const db::commitlog::segment::cf_mark& m) { return out << (m.s._cf_dirty | boost::adaptors::map_keys); } -std::ostream& db::operator<<(std::ostream& out, const db::replay_position& p) { +std::ostream& operator<<(std::ostream& out, const db::replay_position& p) { return out << "{" << p.shard_id() << ", " << p.base_id() << ", " << p.pos << "}"; } +} + void db::commitlog::segment_manager::discard_unused_segments() { logger.trace("Checking for unused segments ({} active)", _segments.size());