summaryrefslogtreecommitdiff
path: root/include/jvmaccess
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /include/jvmaccess
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/jvmaccess')
-rw-r--r--include/jvmaccess/unovirtualmachine.hxx4
-rw-r--r--include/jvmaccess/virtualmachine.hxx8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx
index 5b0e785dec23..7b34b5f71a46 100644
--- a/include/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
@@ -88,8 +88,8 @@ public:
void * getClassLoader() const { return m_classLoader;}
private:
- UnoVirtualMachine(UnoVirtualMachine &) SAL_DELETED_FUNCTION;
- void operator =(UnoVirtualMachine &) SAL_DELETED_FUNCTION;
+ UnoVirtualMachine(UnoVirtualMachine &) = delete;
+ void operator =(UnoVirtualMachine &) = delete;
virtual ~UnoVirtualMachine();
diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx
index 0493e30d4978..b27ce89840bb 100644
--- a/include/jvmaccess/virtualmachine.hxx
+++ b/include/jvmaccess/virtualmachine.hxx
@@ -82,8 +82,8 @@ public:
inline JNIEnv * getEnvironment() const { return m_pEnvironment; }
private:
- AttachGuard(AttachGuard &) SAL_DELETED_FUNCTION;
- void operator =(AttachGuard) SAL_DELETED_FUNCTION;
+ AttachGuard(AttachGuard &) = delete;
+ void operator =(AttachGuard) = delete;
rtl::Reference< VirtualMachine > m_xMachine;
JNIEnv * m_pEnvironment;
@@ -128,8 +128,8 @@ public:
JNIEnv * pMainThreadEnv);
private:
- VirtualMachine(VirtualMachine &) SAL_DELETED_FUNCTION;
- void operator =(VirtualMachine) SAL_DELETED_FUNCTION;
+ VirtualMachine(VirtualMachine &) = delete;
+ void operator =(VirtualMachine) = delete;
virtual ~VirtualMachine();