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 /store | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/object.hxx | 4 | ||||
| -rw-r--r-- | store/source/storbios.hxx | 4 | ||||
| -rw-r--r-- | store/source/stordir.hxx | 4 | ||||
| -rw-r--r-- | store/source/storlckb.hxx | 4 | ||||
| -rw-r--r-- | store/source/storpage.hxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/store/source/object.hxx b/store/source/object.hxx index b44d83bef675..d59d9485adba 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -52,8 +52,8 @@ private: /** The IStoreHandle TypeId. */ static const sal_uInt32 m_nTypeId; - OStoreObject (const OStoreObject&) SAL_DELETED_FUNCTION; - OStoreObject& operator= (const OStoreObject&) SAL_DELETED_FUNCTION; + OStoreObject (const OStoreObject&) = delete; + OStoreObject& operator= (const OStoreObject&) = delete; }; /** Template helper function as dynamic_cast replacement. diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index 0380b134485e..2f8a4db0b295 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -219,8 +219,8 @@ private: storeError saveObjectAt_Impl ( OStorePageObject & rPage, sal_uInt32 nAddr); - OStorePageBIOS (const OStorePageBIOS&) SAL_DELETED_FUNCTION; - OStorePageBIOS& operator= (const OStorePageBIOS&) SAL_DELETED_FUNCTION; + OStorePageBIOS (const OStorePageBIOS&) = delete; + OStorePageBIOS& operator= (const OStorePageBIOS&) = delete; }; inline OStorePageBIOS::operator osl::Mutex& (void) const diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx index 43ba3dc2badf..5deea4f3cb73 100644 --- a/store/source/stordir.hxx +++ b/store/source/stordir.hxx @@ -98,8 +98,8 @@ private: sal_uInt32 m_nPath; rtl_TextToUnicodeConverter m_hTextCvt; - OStoreDirectory_Impl (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION; - OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION; + OStoreDirectory_Impl (const OStoreDirectory_Impl&) = delete; + OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) = delete; }; template<> inline OStoreDirectory_Impl* diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx index 4fffb471dd04..0ab9237c0c8b 100644 --- a/store/source/storlckb.hxx +++ b/store/source/storlckb.hxx @@ -134,8 +134,8 @@ private: bool m_bWriteable; - OStoreLockBytes (const OStoreLockBytes&) SAL_DELETED_FUNCTION; - OStoreLockBytes& operator= (const OStoreLockBytes&) SAL_DELETED_FUNCTION; + OStoreLockBytes (const OStoreLockBytes&) = delete; + OStoreLockBytes& operator= (const OStoreLockBytes&) = delete; }; template<> inline OStoreLockBytes* diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index f57d720076d6..687b38b943e8 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -184,8 +184,8 @@ private: */ storeError remove_Impl (entry & rEntry); - OStorePageManager (const OStorePageManager&) SAL_DELETED_FUNCTION; - OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION; + OStorePageManager (const OStorePageManager&) = delete; + OStorePageManager& operator= (const OStorePageManager&) = delete; }; inline bool OStorePageManager::isValid() const |