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 /stoc | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 4 | ||||
| -rw-r--r-- | stoc/source/javavm/interact.hxx | 4 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.hxx | 4 | ||||
| -rw-r--r-- | stoc/source/uriproc/UriReference.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 301f62d66c0d..690ecb5e712b 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -166,8 +166,8 @@ struct AdapterImpl FactoryImpl * pFactory ); // Copy assignment is forbidden and not implemented. - AdapterImpl (const AdapterImpl &) SAL_DELETED_FUNCTION; - AdapterImpl & operator= (const AdapterImpl &) SAL_DELETED_FUNCTION; + AdapterImpl (const AdapterImpl &) = delete; + AdapterImpl & operator= (const AdapterImpl &) = delete; }; inline AdapterImpl::~AdapterImpl() diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index 8339c8abb322..16f03cf71fdb 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -51,8 +51,8 @@ public: private: class RetryContinuation; - InteractionRequest(InteractionRequest &) SAL_DELETED_FUNCTION; - void operator =(const InteractionRequest&) SAL_DELETED_FUNCTION; + InteractionRequest(InteractionRequest &) = delete; + void operator =(const InteractionRequest&) = delete; virtual ~InteractionRequest(); diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 4de0d00aa485..4b4c5cd280fb 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -119,8 +119,8 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - JavaVirtualMachine(JavaVirtualMachine &) SAL_DELETED_FUNCTION; - void operator =(const JavaVirtualMachine&) SAL_DELETED_FUNCTION; + JavaVirtualMachine(JavaVirtualMachine &) = delete; + void operator =(const JavaVirtualMachine&) = delete; virtual ~JavaVirtualMachine(); diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index e3d8ffe0cc5f..81eb4a5524ba 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -88,8 +88,8 @@ public: bool m_hasFragment; private: - UriReference(UriReference &) SAL_DELETED_FUNCTION; - void operator =(UriReference) SAL_DELETED_FUNCTION; + UriReference(UriReference &) = delete; + void operator =(UriReference) = delete; void appendSchemeSpecificPart(OUStringBuffer & buffer) const; }; |