From 4254960b014c2335ab5d3834bb57a9b3984423ce Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 7 Dec 2018 22:15:34 +0100 Subject: [PATCH] [283-perfdhcp-indicated-requests-rate-is-not-kept-during-testing] Minimal fixes to make it to build on macOS --- src/bin/perfdhcp/receiver.cc | 2 +- src/bin/perfdhcp/receiver.h | 2 ++ src/bin/perfdhcp/test_control.cc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/perfdhcp/receiver.cc b/src/bin/perfdhcp/receiver.cc index e26e06024e..dce28f1dd4 100644 --- a/src/bin/perfdhcp/receiver.cc +++ b/src/bin/perfdhcp/receiver.cc @@ -21,7 +21,7 @@ Receiver::start() { return; } assert(run_flag_.test_and_set() == false); - recv_thread_ = move(unique_ptr(new thread{&Receiver::run, this})); + recv_thread_.reset(new thread{&Receiver::run, this}); } void diff --git a/src/bin/perfdhcp/receiver.h b/src/bin/perfdhcp/receiver.h index 9fe652fe1a..ce7fc4b114 100644 --- a/src/bin/perfdhcp/receiver.h +++ b/src/bin/perfdhcp/receiver.h @@ -37,9 +37,11 @@ typedef boost::shared_ptr PktPtr; /// in main thread packets can be consumed from the queue using getPkt /// method. class Receiver { +public: /// \brief Socket for receiving. const BetterSocket& socket_; +private: /// \brief Flag indicating if thread should run (true) or not (false). boost::atomic_flag run_flag_; diff --git a/src/bin/perfdhcp/test_control.cc b/src/bin/perfdhcp/test_control.cc index 066955fb67..d890edae5b 100644 --- a/src/bin/perfdhcp/test_control.cc +++ b/src/bin/perfdhcp/test_control.cc @@ -1238,7 +1238,7 @@ TestControl::processReceivedPacket6(const BetterSocket& socket, void TestControl::consumeReceivedPackets(Receiver& receiver, const BetterSocket& socket) { PktPtr pkt; - while (pkt = receiver.getPkt()) { + while ((pkt = receiver.getPkt())) { if (CommandOptions::instance().getIpVersion() == 4) { Pkt4Ptr pkt4 = boost::dynamic_pointer_cast(pkt); processReceivedPacket4(socket, pkt4); -- 2.47.2