Kaydet (Commit) f00b77c8 authored tarafından Luboš Luňák's avatar Luboš Luňák

SAL_DELETE -> SAL_DELETED_FUNCTION, for a more descriptive name

üst f1335171
...@@ -582,7 +582,7 @@ public: ...@@ -582,7 +582,7 @@ public:
template< typename T > template< typename T >
typename internal::Enable< void, typename internal::Enable< void,
!internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type !internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type
append( T* ) SAL_DELETE; append( T* ) SAL_DELETED_FUNCTION;
#endif #endif
// This overload is needed because OUString has a ctor from rtl_uString*, but // This overload is needed because OUString has a ctor from rtl_uString*, but
......
...@@ -408,9 +408,9 @@ namespace css = ::com::sun::star; ...@@ -408,9 +408,9 @@ namespace css = ::com::sun::star;
@since LibreOffice 4.1 @since LibreOffice 4.1
*/ */
#if defined HAVE_CXX11_DELETE #if defined HAVE_CXX11_DELETE
#define SAL_DELETE = delete #define SAL_DELETED_FUNCTION = delete
#else #else
#define SAL_DELETE #define SAL_DELETED_FUNCTION
#endif #endif
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -94,7 +94,7 @@ public: ...@@ -94,7 +94,7 @@ public:
// original overload have been adapted (in platform // original overload have been adapted (in platform
// specific code etc.): // specific code etc.):
SfxMedium(String const &, StreamMode, void *) SfxMedium(String const &, StreamMode, void *)
SAL_DELETE; SAL_DELETED_FUNCTION;
SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const String& rBaseURL, const String& rBaseURL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment