comparison irccdctl/cli.cpp @ 489:349fe29d86d5

Tests: switch to Boost, closes #680
author David Demelier <markand@malikania.fr>
date Sun, 20 Aug 2017 08:16:39 +0200
parents 7e273b7f4f92
children fbd80bfcf58d
comparison
equal deleted inserted replaced
488:7e273b7f4f92 489:349fe29d86d5
18 18
19 #include <cassert> 19 #include <cassert>
20 #include <iostream> 20 #include <iostream>
21 #include <sstream> 21 #include <sstream>
22 22
23 #include <boost/timer/timer.hpp>
24
23 #include <json.hpp> 25 #include <json.hpp>
24 26
25 #include "cli.hpp" 27 #include "cli.hpp"
26 #include "elapsed-timer.hpp"
27 #include "irccdctl.hpp" 28 #include "irccdctl.hpp"
28 #include "logger.hpp" 29 #include "logger.hpp"
29 #include "options.hpp" 30 #include "options.hpp"
30 #include "util.hpp" 31 #include "util.hpp"
31 32
63 auto id = irccdctl.client().onMessage.connect([&] (auto input) { 64 auto id = irccdctl.client().onMessage.connect([&] (auto input) {
64 msg = std::move(input); 65 msg = std::move(input);
65 }); 66 });
66 67
67 try { 68 try {
68 ElapsedTimer timer; 69 boost::timer::cpu_timer timer;
69 70
70 while (irccdctl.client().isConnected() && !msg.is_object() && timer.elapsed() < 3000) 71 while (irccdctl.client().isConnected() && !msg.is_object() && timer.elapsed().wall / 1000000LL < 3000)
71 util::poller::poll(3000 - timer.elapsed(), irccdctl); 72 util::poller::poll(3000 - timer.elapsed().wall / 1000000LL, irccdctl);
72 } catch (const std::exception &) { 73 } catch (const std::exception &) {
73 irccdctl.client().onMessage.disconnect(id); 74 irccdctl.client().onMessage.disconnect(id);
74 throw; 75 throw;
75 } 76 }
76 77