comphelper: replace boost::function with std::function

Change-Id: I042c97d8472c3afceffba36808687f382571e6c2

comphelper/source/misc/scopeguard.cxx

@@ -52,7 +52,7 @@ ScopeGuard::~ScopeGuard()
 
 void ScopeGuard::dismiss()
 {
-    m_func.clear();
+    m_func = nullptr;
 }
 
 FlagGuard::~FlagGuard()

include/comphelper/scopeguard.hxx

@@ -21,7 +21,8 @@
 #define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 
 #include <comphelper/comphelperdllapi.h>
-#include <boost/function.hpp>
+
+#include <functional>
 
 namespace comphelper {
 
@@ -53,7 +54,7 @@ private:
     ScopeGuard(const ScopeGuard&) SAL_DELETED_FUNCTION;
     ScopeGuard& operator=(const ScopeGuard&) SAL_DELETED_FUNCTION;
 
-    ::boost::function0<void> m_func; // preferring portable syntax
+    ::std::function<void ()> m_func;
     exc_handling const m_excHandling;
 };
 

include/comphelper/servicedecl.hxx

@@ -25,22 +25,23 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <uno/environment.h>
 #include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition.hpp>
 #include <boost/preprocessor/seq/enum.hpp>
 
+#include <functional>
+
 namespace comphelper {
 namespace service_decl {
 
 class ServiceDecl;
 
 namespace detail {
-typedef ::boost::function3<
-    css::uno::Reference<css::uno::XInterface> /* return */,
-    ServiceDecl const&,
+typedef ::std::function<
+    css::uno::Reference<css::uno::XInterface> /* return */
+    (ServiceDecl const&,
      css::uno::Sequence<css::uno::Any> const&,
-    css::uno::Reference<css::uno::XComponentContext> const&> CreateFuncF;
+     css::uno::Reference<css::uno::XComponentContext> const&)> CreateFuncF;
 }
 
 /** Class to declare a service implementation.  There is no need to implement

svl/source/undo/undo.cxx

@@ -30,6 +30,7 @@
 #include <vector>
 #include <list>
 #include <limits>
+#include <algorithm>
 
 using ::com::sun::star::uno::Exception;