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 /basic | |
parent | HAVE_CXX11_DELETE is required on all supported toolchains (diff) | |
download | core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.tar.gz core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.zip |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/codegen.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 6 | ||||
-rw-r--r-- | basic/source/inc/symtbl.hxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index 1b928cca5114..d50994be5e09 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -66,8 +66,8 @@ class PCodeBuffConvertor sal_uInt8* m_pCnvtdBuf; S m_nCnvtdSize; - PCodeBuffConvertor(const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION; - PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION; + PCodeBuffConvertor(const PCodeBuffConvertor& ) = delete; + PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) = delete; public: PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ), m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); } S GetSize(){ return m_nCnvtdSize; } diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index bead0c9873e6..692e5140aefa 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -192,8 +192,8 @@ class SbUnoProperty : public SbxProperty SbxDataType mRealType; virtual ~SbUnoProperty(); bool mbUnoStruct; - SbUnoProperty( const SbUnoProperty&) SAL_DELETED_FUNCTION; - SbUnoProperty& operator = ( const SbUnoProperty&) SAL_DELETED_FUNCTION; + SbUnoProperty( const SbUnoProperty&) = delete; + SbUnoProperty& operator = ( const SbUnoProperty&) = delete; public: TYPEINFO_OVERRIDE(); @@ -395,7 +395,7 @@ private: VBAConstantsHash aConstHash; bool isInited; VBAConstantHelper():isInited( false ) {} - VBAConstantHelper(const VBAConstantHelper&) SAL_DELETED_FUNCTION; + VBAConstantHelper(const VBAConstantHelper&) = delete; void init(); public: static VBAConstantHelper& instance(); diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 2682eee31d19..e4e84fe6a6a6 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -159,7 +159,7 @@ public: sal_uInt32 Reference(); // reference symbol in code private: - SbiSymDef( const SbiSymDef& ) SAL_DELETED_FUNCTION; + SbiSymDef( const SbiSymDef& ) = delete; }; @@ -202,7 +202,7 @@ public: void Match( SbiProcDef* pForward ); private: - SbiProcDef( const SbiProcDef& ) SAL_DELETED_FUNCTION; + SbiProcDef( const SbiProcDef& ) = delete; }; |