summaryrefslogtreecommitdiff
path: root/codemaker
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 /codemaker
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'codemaker')
-rw-r--r--codemaker/source/cppumaker/includes.hxx4
-rw-r--r--codemaker/source/javamaker/classfile.hxx8
2 files changed, 6 insertions, 6 deletions
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index c28cfb13c497..e08923c2765b 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -65,8 +65,8 @@ public:
FileStream & out, OString const & entityName, bool hpp);
private:
- Includes(Includes &) SAL_DELETED_FUNCTION;
- void operator =(const Includes&) SAL_DELETED_FUNCTION;
+ Includes(Includes &) = delete;
+ void operator =(const Includes&) = delete;
bool isInterfaceType(OString const & entityName) const;
diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx
index b048a47d08f5..949203dea553 100644
--- a/codemaker/source/javamaker/classfile.hxx
+++ b/codemaker/source/javamaker/classfile.hxx
@@ -130,8 +130,8 @@ public:
Position getPosition() const;
private:
- Code(Code &) SAL_DELETED_FUNCTION;
- void operator =(const Code&) SAL_DELETED_FUNCTION;
+ Code(Code &) = delete;
+ void operator =(const Code&) = delete;
explicit Code(ClassFile & classFile);
@@ -181,8 +181,8 @@ public:
private:
typedef std::map< rtl::OString, sal_uInt16 > Map;
- ClassFile(ClassFile &) SAL_DELETED_FUNCTION;
- void operator =(const ClassFile&) SAL_DELETED_FUNCTION;
+ ClassFile(ClassFile &) = delete;
+ void operator =(const ClassFile&) = delete;
sal_uInt16 nextConstantPoolIndex(sal_uInt16 width);
sal_uInt16 addUtf8Info(rtl::OString const & value);