std::function is a better choice than a raw function pointer here. You probably still want to be careful about cleaning up stuff you captured, but it's not like a function pointer wasn't going to let you shoot yourself in the foot given enough dedication.

llvm-svn: 217718

1 files changed, 3 insertions, 2 deletions

diff --git a/lldb/include/lldb/Utility/CleanUp.h b/lldb/include/lldb/Utility/CleanUp.h
index 9dd3ca5fe12..9ffe5de27df 100644
--- a/lldb/include/lldb/Utility/CleanUp.h
+++ b/lldb/include/lldb/Utility/CleanUp.h
@@ -11,6 +11,7 @@
 #define liblldb_CleanUp_h_
 
 #include "lldb/lldb-public.h"
+#include <functional>
 
 namespace lldb_utility {
 
@@ -57,7 +58,7 @@ class CleanUp
 {
 public:
     typedef T value_type;
-    typedef R (*CallbackType)(value_type);
+    typedef std::function<R(value_type)> CallbackType;
 
     //----------------------------------------------------------------------
     // Constructor that sets the current value only. No values are 
@@ -188,7 +189,7 @@ class CleanUp2
 {
 public:
     typedef T value_type;
-    typedef R (*CallbackType)(value_type, A0);
+    typedef std::function<R(value_type,A0)> CallbackType;
     
     //----------------------------------------------------------------------
     // Constructor that sets the current value only. No values are