diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
| commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
| tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /bridges/inc | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'bridges/inc')
4 files changed, 8 insertions, 8 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx index 3e13b2a919aa..9cfa92bcddef 100644 --- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx @@ -77,8 +77,8 @@ public: uno_Mapping * getUno2Cpp() { return &aUno2Cpp; } private: - Bridge(Bridge &) SAL_DELETED_FUNCTION; - void operator =(const Bridge&) SAL_DELETED_FUNCTION; + Bridge(Bridge &) = delete; + void operator =(const Bridge&) = delete; Bridge( uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_, diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx index 67ebce4f7d65..4546dbe33b7a 100644 --- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx @@ -66,8 +66,8 @@ public: static CppInterfaceProxy * castInterfaceToProxy(void * pInterface); private: - CppInterfaceProxy(CppInterfaceProxy &) SAL_DELETED_FUNCTION; - void operator =(const CppInterfaceProxy&) SAL_DELETED_FUNCTION; + CppInterfaceProxy(CppInterfaceProxy &) = delete; + void operator =(const CppInterfaceProxy&) = delete; CppInterfaceProxy( Bridge * pBridge_, uno_Interface * pUnoI_, diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx index 6e8e240c6421..f678765b7826 100644 --- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx @@ -73,8 +73,8 @@ public: com::sun::star::uno::XInterface * getCppI() { return pCppI; } private: - UnoInterfaceProxy(UnoInterfaceProxy &) SAL_DELETED_FUNCTION; - void operator =(const UnoInterfaceProxy&) SAL_DELETED_FUNCTION; + UnoInterfaceProxy(UnoInterfaceProxy &) = delete; + void operator =(const UnoInterfaceProxy&) = delete; UnoInterfaceProxy( Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_, diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 09246c8e705f..b5d7aaa4f345 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -120,8 +120,8 @@ private: class BaseOffset; - VtableFactory(VtableFactory &) SAL_DELETED_FUNCTION; - void operator =(const VtableFactory&) SAL_DELETED_FUNCTION; + VtableFactory(VtableFactory &) = delete; + void operator =(const VtableFactory&) = delete; bool createBlock(Block &block, sal_Int32 slotCount) const; |