summaryrefslogtreecommitdiff
path: root/include/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 /include/codemaker
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/codemaker')
-rw-r--r--include/codemaker/exceptiontree.hxx8
-rw-r--r--include/codemaker/generatedtypeset.hxx4
2 files changed, 6 insertions, 6 deletions
diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx
index 091ff034bf72..9c6b3b919b94 100644
--- a/include/codemaker/exceptiontree.hxx
+++ b/include/codemaker/exceptiontree.hxx
@@ -54,8 +54,8 @@ struct ExceptionTreeNode {
Children children;
private:
- ExceptionTreeNode(ExceptionTreeNode &) SAL_DELETED_FUNCTION;
- void operator =(ExceptionTreeNode) SAL_DELETED_FUNCTION;
+ ExceptionTreeNode(ExceptionTreeNode &) = delete;
+ void operator =(ExceptionTreeNode) = delete;
void clearChildren();
};
@@ -107,8 +107,8 @@ public:
ExceptionTreeNode const & getRoot() const { return m_root; }
private:
- ExceptionTree(ExceptionTree &) SAL_DELETED_FUNCTION;
- void operator =(const ExceptionTree&) SAL_DELETED_FUNCTION;
+ ExceptionTree(ExceptionTree &) = delete;
+ void operator =(const ExceptionTree&) = delete;
ExceptionTreeNode m_root;
};
diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index ca4ad24c68be..f6cb452c1990 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -60,8 +60,8 @@ public:
{ return m_set.find(type) != m_set.end(); }
private:
- GeneratedTypeSet(GeneratedTypeSet &) SAL_DELETED_FUNCTION;
- void operator =(const GeneratedTypeSet&) SAL_DELETED_FUNCTION;
+ GeneratedTypeSet(GeneratedTypeSet &) = delete;
+ void operator =(const GeneratedTypeSet&) = delete;
std::unordered_set< OString, OStringHash > m_set;
};