From 2ffd7d7b99dfd72cf070aec28ad4963dc51bd20b Mon Sep 17 00:00:00 2001 From: Calle Wilund Date: Mon, 8 Feb 2016 08:48:48 +0000 Subject: [PATCH] stream_manager: Change construction to make gcc 4.9 happy gcc 4.9 complains about the type{ val, val } construction of type with implicit default constructor, i.e. member = initial declarations. gcc 5 does not (and possibly rightly so). However, we still (implicitly) claim to support gcc 4.9 so why not just change this particular instance. Message-Id: <1454921328-1106-1-git-send-email-calle@scylladb.com> --- streaming/stream_manager.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/streaming/stream_manager.cc b/streaming/stream_manager.cc index b1109d5cc8..5752d790e0 100644 --- a/streaming/stream_manager.cc +++ b/streaming/stream_manager.cc @@ -152,7 +152,7 @@ future stream_manager::get_progress_on_all_shards(UUID plan_id, gm [plan_id, peer] (auto& sm) { return sm.get_progress(plan_id, peer); }, - stream_bytes{0,0}, + stream_bytes(), std::plus() ); } @@ -166,7 +166,7 @@ future stream_manager::get_progress_on_all_shards(gms::inet_addres } return ret; }, - stream_bytes{0,0}, + stream_bytes(), std::plus() ); } @@ -182,7 +182,7 @@ future stream_manager::get_progress_on_all_shards() { } return ret; }, - stream_bytes{0,0}, + stream_bytes(), std::plus() ); }