[Libreoffice-commits] .: sal/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 9 13:03:16 PST 2012
sal/inc/rtl/ustrbuf.hxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit dc6277ef41dcf529760ad894e0aa124f18722c33
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Dec 9 22:42:04 2012 +0200
WaE: deleted function definitions are a C++11 extension
Change-Id: I8f070fb53c0310761c3a0a2407d48ca1c1ac5e18
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 3814a6f..9850bfa 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -579,10 +579,17 @@ public:
// Pointer can be automatically converted to bool, which is unwanted here.
// Explicitly delete all pointer append() overloads to prevent this
// (except for char* and sal_Unicode* overloads, which are handled elsewhere).
+#if defined(__clang__) && defined(LIBO_WERROR)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wc++11-extensions"
+#endif
template< typename T >
typename internal::Enable< void,
!internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type
append( T* ) = delete;
+#if defined(__clang__) && defined(LIBO_WERROR)
+#pragma GCC diagnostic pop
+#endif
#endif
#endif
More information about the Libreoffice-commits
mailing list