commit 8c1f669b0ddaa69e18bee77d9feaf617cc053956
author Patrick Williams <patrick@stwcx.xyz> Tue Mar 01 16:29:42 2022 -0600
committer Patrick Williams <patrick@stwcx.xyz> Tue Mar 01 16:29:44 2022 -0600
tree 60ec3cbb12aab74107a4ba63e7e142356fb9c4fa
parent 9ca0c929d9ae80580c6d9f9bf7bce1231759c6bf

asio: object_server: remove non-if_constexpr cases

C++17 has been out for a long time now.  There isn't any reason to
continue supporting compilers without if-constexpr.  Delete these cases
to remove the cruft.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I88fd98cc129756d34380075e244dcaaafe193c3f

include/sdbusplus/asio/object_server.hpp

diff --git a/include/sdbusplus/asio/object_server.hpp b/include/sdbusplus/asio/object_server.hpp
index 456ba4d..2f5d888 100644
--- a/include/sdbusplus/asio/object_server.hpp
+++ b/include/sdbusplus/asio/object_server.hpp
@@ -75,7 +75,6 @@
 static constexpr bool callbackWantsMessage = (FirstArgIsMessage_v<T> ||
                                               SecondArgIsMessage_v<T>);
 
-#ifdef __cpp_if_constexpr
 namespace details
 {
 // small helper class to count the number of non-dbus arguments
@@ -109,7 +108,6 @@
     }
 };
 } // namespace details
-#endif // __cpp_if_constexpr
 
 template <typename CallbackType>
 class callback_method_instance : public callback
@@ -140,7 +138,7 @@
     {
         std::apply(func_, inputArgs);
     }
-#ifdef __cpp_if_constexpr
+
     // optional message-first-argument callback
     int expandCall(message_t& m)
     {
@@ -167,25 +165,8 @@
         ret.method_return();
         return 1;
     };
-#else
-    // normal dbus-types-only callback
-    int expandCall(message_t& m)
-    {
-        InputTupleType inputArgs;
-        if (!utility::read_into_tuple(inputArgs, m))
-        {
-            return -EINVAL;
-        }
-
-        auto ret = m.new_method_return();
-        callFunction<ResultType>(ret, inputArgs);
-        ret.method_return();
-        return 1;
-    };
-#endif
 };
 
-#ifdef __cpp_if_constexpr
 template <typename CallbackType>
 class coroutine_method_instance : public callback
 {
@@ -280,7 +261,6 @@
         ret.method_return();
     };
 };
-#endif // __cpp_if_constexpr
 
 template <typename PropertyType, typename CallbackType>
 class callback_get_instance : public callback
@@ -573,7 +553,6 @@
         return true;
     }
 
-#ifdef __cpp_if_constexpr
     template <typename CallbackType>
     bool register_method(const std::string& name, CallbackType&& handler)
     {
@@ -612,36 +591,6 @@
                                             resultType.data(), method_handler));
         return true;
     }
-#else  // __cpp_if_constexpr not available
-       // without __cpp_if_constexpr, no support for message or yield in
-       // callback
-    template <typename CallbackType>
-    bool register_method(const std::string& name, CallbackType&& handler)
-    {
-        using CallbackSignature = boost::callable_traits::args_t<CallbackType>;
-        using InputTupleType = utility::decay_tuple_t<CallbackSignature>;
-        using ResultType = boost::callable_traits::return_type_t<CallbackType>;
-
-        if (initialized_)
-        {
-            return false;
-        }
-        static const auto argType = utility::strip_ends(
-            utility::tuple_to_array(message::types::type_id<InputTupleType>()));
-        static const auto resultType =
-            utility::tuple_to_array(message::types::type_id<ResultType>());
-
-        auto nameItr = methodNames_.emplace(methodNames_.end(), name);
-
-        callbacksMethod_[name] =
-            std::make_unique<callback_method_instance<CallbackType>>(
-                std::move(handler));
-
-        vtable_.emplace_back(vtable::method(nameItr->c_str(), argType.data(),
-                                            resultType.data(), method_handler));
-        return true;
-    }
-#endif // __cpp_if_constexpr
 
     static int get_handler(sd_bus* /*bus*/, const char* /*path*/,
                            const char* /*interface*/, const char* property,