sal/inc/rtl/ustrbuf.hxx | 2 +- sal/inc/sal/types.h | 4 ++-- sfx2/inc/sfx2/docfile.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f00b77c856067b77a6dc5c2d90cc1205d87de03a Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Tue Dec 11 17:03:02 2012 +0100 SAL_DELETE -> SAL_DELETED_FUNCTION, for a more descriptive name diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 2095cd5..98f1fc5 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 46f6003..125c098 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 43675fa..02f87fe 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,
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits