commit 21c6059531e3ac4ccb7557f54368cc849dece264
author Ed Tanous <ed@tanous.net> Mon Aug 17 23:43:46 2020 -0700
committer Ed Tanous <ed@tanous.net> Mon Aug 24 16:45:45 2020 +0000
tree a1ffbb12afbbc6bb89f0bd6c43e599eb2eaa9108
parent 64354ef2c28fa86934e1fcb64e2a5d1eec4d5486

Fix includes and update to latest io_context

sdbusplus today #includes asio.hpp, which causes it to compile a lot of
things that eventually get thrown away.  This causes worse build
problems than normal.

As part of cleaning this up, the mapper needs to move to utilizing its
own #includes for features, rather than relying on sdbusplus.

Also, move names from io_service to io_context to prepare for boost 1.74.

Signed-off-by: Ed Tanous <ed@tanous.net>
Change-Id: Ie8063e66eba7021b2dc3f4f0aeafeb1f2c5f8e1b

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 26b0285..896d248 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,6 +9,8 @@
 
 #include <atomic>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/signal_set.hpp>
 #include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <iomanip>
@@ -78,7 +80,7 @@
 struct InProgressIntrospect
 {
     InProgressIntrospect(
-        sdbusplus::asio::connection* system_bus, boost::asio::io_service& io,
+        sdbusplus::asio::connection* system_bus, boost::asio::io_context& io,
         const std::string& process_name, AssociationMaps& am
 #ifdef DEBUG
         ,
@@ -116,7 +118,7 @@
 #endif
     }
     sdbusplus::asio::connection* system_bus;
-    boost::asio::io_service& io;
+    boost::asio::io_context& io;
     std::string process_name;
     AssociationMaps& assocMaps;
 #ifdef DEBUG
@@ -240,7 +242,7 @@
 }
 
 void start_new_introspect(
-    sdbusplus::asio::connection* system_bus, boost::asio::io_service& io,
+    sdbusplus::asio::connection* system_bus, boost::asio::io_context& io,
     interface_map_type& interface_map, const std::string& process_name,
     AssociationMaps& assocMaps,
 #ifdef DEBUG
@@ -287,7 +289,7 @@
 }
 
 void doListNames(
-    boost::asio::io_service& io, interface_map_type& interface_map,
+    boost::asio::io_context& io, interface_map_type& interface_map,
     sdbusplus::asio::connection* system_bus,
     boost::container::flat_map<std::string, std::string>& name_owners,
     AssociationMaps& assocMaps, sdbusplus::asio::object_server& objectServer)
@@ -440,7 +442,7 @@
 int main(int argc, char** argv)
 {
     auto options = ArgumentParser(argc, argv);
-    boost::asio::io_service io;
+    boost::asio::io_context io;
     std::shared_ptr<sdbusplus::asio::connection> system_bus =
         std::make_shared<sdbusplus::asio::connection>(io);