3 files changed, 25 insertions, 22 deletions
diff --git a/gdb/unittests/intrusive_list-selftests.c b/gdb/unittests/intrusive_list-selftests.c
index 8b2b2d1..1b38ac3 100644
--- a/gdb/unittests/intrusive_list-selftests.c
+++ b/gdb/unittests/intrusive_list-selftests.c
@@ -754,7 +754,7 @@ struct intrusive_list_test
 
 template <typename ListType>
 static void
-test_intrusive_list ()
+test_intrusive_list_1 ()
 {
   intrusive_list_test<ListType> tests;
 
@@ -804,8 +804,8 @@ test_node_is_linked ()
 static void
 test_intrusive_list ()
 {
-  test_intrusive_list<item_with_base_list> ();
-  test_intrusive_list<item_with_member_list> ();
+  test_intrusive_list_1<item_with_base_list> ();
+  test_intrusive_list_1<item_with_member_list> ();
   test_node_is_linked ();
 }
 
diff --git a/gdbsupport/selftest.cc b/gdbsupport/selftest.cc
index d0511ab..55f530a 100644
--- a/gdbsupport/selftest.cc
+++ b/gdbsupport/selftest.cc
@@ -21,6 +21,7 @@
 #include "common-debug.h"
 #include "selftest.h"
 #include <map>
+#include <functional>
 
 namespace selftests
 {
@@ -30,22 +31,6 @@ namespace selftests
 
 static std::map<std::string, std::unique_ptr<selftest>> tests;
 
-/* A selftest that calls the test function without arguments.  */
-
-struct simple_selftest : public selftest
-{
-  simple_selftest (self_test_function *function_)
-  : function (function_)
-  {}
-
-  void operator() () const override
-  {
-    function ();
-  }
-
-  self_test_function *function;
-};
-
 /* See selftest.h.  */
 
 void
@@ -57,12 +42,30 @@ register_test (const std::string &name, selftest *test)
   tests[name] = std::unique_ptr<selftest> (test);
 }
 
+/* A selftest that calls the test function without arguments.  */
+
+struct lambda_selftest : public selftest
+{
+  lambda_selftest (std::function<void(void)> function_)
+  {
+    function  = function_;
+  }
+
+  void operator() () const override
+  {
+    function ();
+  }
+
+  std::function<void(void)> function;
+};
+
 /* See selftest.h.  */
 
 void
-register_test (const std::string &name, self_test_function *function)
+register_test (const std::string &name,
+	       std::function<void(void)> function)
 {
-  register_test (name, new simple_selftest (function));
+  register_test (name, new lambda_selftest (function));
 }
 
 /* See selftest.h.  */
diff --git a/gdbsupport/selftest.h b/gdbsupport/selftest.h
index 13441b0..b75e01e 100644
--- a/gdbsupport/selftest.h
+++ b/gdbsupport/selftest.h
@@ -44,7 +44,7 @@ extern void register_test (const std::string &name, selftest *test);
 /* Register a new self-test.  */
 
 extern void register_test (const std::string &name,
-			   self_test_function *function);
+			   std::function<void(void)> function);
 
 /* Run all the self tests.  This print a message describing the number
    of test and the number of failures.