jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Simon Fels 2018-03-02 10:26:36 +02:00 • committed by GitHub
commit 9dfea170d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/anbox/runtime.cpp
View file

@ -53,7 +53,13 @@ std::shared_ptr<Runtime> Runtime::create(std::uint32_t pool_size) {
Runtime::Runtime(std::uint32_t pool_size) Runtime::Runtime(std::uint32_t pool_size)
: pool_size_{pool_size}, : pool_size_{pool_size},
#if BOOST_VERSION >= 106600
service_{static_cast<int>(pool_size_)},
#else
service_{pool_size_}, service_{pool_size_},
#endif
strand_{service_}, strand_{service_},
keep_alive_{service_} {} keep_alive_{service_} {}

1
src/anbox/runtime.h
View file

@ -19,6 +19,7 @@
#define ANBOX_RUNTIME_H_ #define ANBOX_RUNTIME_H_
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/version.hpp>
#include <memory.h> #include <memory.h>
#include <functional> #include <functional>