diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-31 18:27:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:24:24 +0200 |
| commit | 819fd24487aa120e6f0df1488d1afef7621252cb (patch) | |
| tree | 5d49646c60b8e220ee272c3fb4b277a69a467010 /include | |
| parent | a713fb5e3ac8b521abd441f040853f439f1a3f7c (diff) | |
comphelper: replace boost::function with std::function
Change-Id: I042c97d8472c3afceffba36808687f382571e6c2
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/scopeguard.hxx | 5 | ||||
| -rw-r--r-- | include/comphelper/servicedecl.hxx | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx index f120cd7319c5..324ad6ce2090 100644 --- a/include/comphelper/scopeguard.hxx +++ b/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; }; diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index 02fbb2ff4e10..f9b0b12ddb01 100644 --- a/include/comphelper/servicedecl.hxx +++ b/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&, - css::uno::Sequence<css::uno::Any> const&, - css::uno::Reference<css::uno::XComponentContext> const&> CreateFuncF; +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; } /** Class to declare a service implementation. There is no need to implement |