diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 17:03:02 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-11 17:03:29 +0100 |
| commit | f00b77c856067b77a6dc5c2d90cc1205d87de03a (patch) | |
| tree | 7f3c2649fea9771ca04fdef7fae6e735fdb84d53 | |
| parent | f1335171987272b66c2e1e0b02cddb28d44502ec (diff) | |
SAL_DELETE -> SAL_DELETED_FUNCTION, for a more descriptive name
| -rw-r--r-- | sal/inc/rtl/ustrbuf.hxx | 2 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 4 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 2095cd5af514..98f1fc5ee911 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -582,7 +582,7 @@ public: template< typename T > typename internal::Enable< void, !internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type - append( T* ) SAL_DELETE; + append( T* ) SAL_DELETED_FUNCTION; #endif // This overload is needed because OUString has a ctor from rtl_uString*, but diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 46f600310b6c..125c098f5f0a 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -408,9 +408,9 @@ namespace css = ::com::sun::star; @since LibreOffice 4.1 */ #if defined HAVE_CXX11_DELETE -#define SAL_DELETE = delete +#define SAL_DELETED_FUNCTION = delete #else -#define SAL_DELETE +#define SAL_DELETED_FUNCTION #endif #endif /* __cplusplus */ diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index 43675fa275b5..02f87fe030a0 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -94,7 +94,7 @@ public: // original overload have been adapted (in platform // specific code etc.): SfxMedium(String const &, StreamMode, void *) - SAL_DELETE; + SAL_DELETED_FUNCTION; SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const String& rBaseURL, |