Support generic callables in ScopedOperation

In order to use a scoped function (or any other type of callable) with
ScopedOperation, we template ScopedOperation with the callable rather
than making the call always an amp::callback.

GIT_ORIGIN_SPP_REV_ID: 38a0277ccd8183c91a11b7e97d2923e035e22365

Author: bemerybmw

score/utils/BUILD

@@ -61,7 +61,10 @@ cc_gtest_unit_test(
     name = "scoped_operation_test",
     srcs = ["test/scoped_operation_test.cpp"],
     features = COMPILER_WARNING_FEATURES,
-    deps = [":scoped_operation"],
+    deps = [
+        ":scoped_operation",
+        "@score_baselibs//score/language/safecpp/scoped_function:move_only_scoped_function",
+    ],
 )
 
 cc_unit_test_suites_for_host_and_qnx(

score/utils/src/scoped_operation.h

@@ -15,6 +15,8 @@
 
 #include <score/callback.hpp>
 
+#include <type_traits>
+
 namespace score
 {
 namespace utils
@@ -24,12 +26,10 @@ namespace utils
 ///
 /// @tparam Capacity The capacity to use by callback in storage
 /// @tparam Alignment The alignment of callback in storage
-template <std::size_t Capacity = score::cpp::callback<void()>::capacity_t::value,
-          std::size_t Alignment = score::cpp::callback<void()>::alignment_t::value>
+template <typename CallbackType = score::cpp::callback<void()>>
 class ScopedOperation final
 {
-  private:
-    using CallbackType = score::cpp::callback<void(), Capacity, Alignment>;
+    static_assert(std::is_invocable_v<CallbackType>);
 
   public:
     explicit ScopedOperation(CallbackType fn) : fn_{std::move(fn)} {}

score/utils/test/scoped_operation_test.cpp

@@ -12,6 +12,8 @@
  ********************************************************************************/
 #include "score/utils/src/scoped_operation.h"
 
+#include "score/language/safecpp/scoped_function/move_only_scoped_function.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -24,7 +26,7 @@ namespace ifwi
 namespace
 {
 
-TEST(ScopedOperationTest, callFunctionOnDestruction)
+TEST(ScopedOperationTest, CallDefaultFunctionOnDestruction)
 {
     bool functionCalled = false;
     {
@@ -36,6 +38,32 @@ TEST(ScopedOperationTest, callFunctionOnDestruction)
     ASSERT_TRUE(functionCalled);
 }
 
+TEST(ScopedOperationTest, CallAmpCallbackOnDestruction)
+{
+    bool functionCalled = false;
+    {
+        utils::ScopedOperation<score::cpp::callback<void()>> scopedOperation{[&functionCalled]() noexcept {
+            functionCalled = true;
+        }};
+        functionCalled = false;
+    }
+    ASSERT_TRUE(functionCalled);
+}
+
+TEST(ScopedOperationTest, CallScopedFunctionOnDestruction)
+{
+    safecpp::Scope<> scope{};
+    bool functionCalled = false;
+    {
+        utils::ScopedOperation<safecpp::MoveOnlyScopedFunction<void()>> scopedOperation{
+            {scope, [&functionCalled]() noexcept {
+                 functionCalled = true;
+             }}};
+        functionCalled = false;
+    }
+    ASSERT_TRUE(functionCalled);
+}
+
 }  // namespace
 }  // namespace ifwi
 }  // namespace platform