merged with master

This commit is contained in:
badaix 2016-11-17 15:47:23 +01:00
commit 8bd5361081
64 changed files with 1481 additions and 275 deletions

View file

@ -171,7 +171,7 @@ int main(int argc, char* argv[])
std::thread t(func, &io_service);
while (!g_terminated)
usleep(100*1000);
chronos::sleep(100);
io_service.stop();
t.join();