From ffcae32ea92343dea1cf981deb8a4c2a04a09348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dhiego=20Cassiano=20Foga=C3=A7a=20Barbosa?= Date: Tue, 6 Feb 2018 01:09:45 -0200 Subject: [PATCH 1/3] Fix narrowing conversion inside {} --- src/anbox/runtime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/anbox/runtime.cpp b/src/anbox/runtime.cpp index cbfefa7..a97b673 100644 --- a/src/anbox/runtime.cpp +++ b/src/anbox/runtime.cpp @@ -53,7 +53,7 @@ std::shared_ptr Runtime::create(std::uint32_t pool_size) { Runtime::Runtime(std::uint32_t pool_size) : pool_size_{pool_size}, - service_{pool_size_}, + service_{static_cast(pool_size_)}, strand_{service_}, keep_alive_{service_} {} From 8b74034a17d44fef61123f3508a6b39ae23e826b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dhiego=20Cassiano=20Foga=C3=A7a=20Barbosa?= Date: Wed, 14 Feb 2018 15:36:58 -0200 Subject: [PATCH 2/3] Fixed build on boost <= 1.65 --- src/anbox/runtime.cpp | 6 ++++++ src/anbox/runtime.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/anbox/runtime.cpp b/src/anbox/runtime.cpp index a97b673..d7e9706 100644 --- a/src/anbox/runtime.cpp +++ b/src/anbox/runtime.cpp @@ -53,7 +53,13 @@ std::shared_ptr Runtime::create(std::uint32_t pool_size) { Runtime::Runtime(std::uint32_t pool_size) : pool_size_{pool_size}, + + #if BOOST_VERSION == 106600 service_{static_cast(pool_size_)}, + #else + service_{pool_size_}, + #endif + strand_{service_}, keep_alive_{service_} {} diff --git a/src/anbox/runtime.h b/src/anbox/runtime.h index 43065be..ea521e3 100644 --- a/src/anbox/runtime.h +++ b/src/anbox/runtime.h @@ -19,6 +19,7 @@ #define ANBOX_RUNTIME_H_ #include +#include #include #include From a044e70b3a00788f4fbebb28ca728beff7c9459b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dhiego=20Cassiano=20Foga=C3=A7a=20Barbosa?= Date: Fri, 16 Feb 2018 19:52:51 -0200 Subject: [PATCH 3/3] Updated preprocessor condition Without >=, the patch would not work on newer versions of Boost --- src/anbox/runtime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/anbox/runtime.cpp b/src/anbox/runtime.cpp index d7e9706..90c6768 100644 --- a/src/anbox/runtime.cpp +++ b/src/anbox/runtime.cpp @@ -54,7 +54,7 @@ std::shared_ptr Runtime::create(std::uint32_t pool_size) { Runtime::Runtime(std::uint32_t pool_size) : pool_size_{pool_size}, - #if BOOST_VERSION == 106600 + #if BOOST_VERSION >= 106600 service_{static_cast(pool_size_)}, #else service_{pool_size_},