diff options
| -rw-r--r-- | include/comphelper/scopeguard.hxx | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx index 60836a7661c7..6b5b397686f4 100644 --- a/include/comphelper/scopeguard.hxx +++ b/include/comphelper/scopeguard.hxx @@ -24,6 +24,28 @@ #include <sal/log.hxx> #include <com/sun/star/uno/Exception.hpp> + +// For some reason, Android buildbot issues -Werror like this: +// In file included from +// /home/android/lo/master-android-arm/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx:50: +// /home/android/lo/master-android-arm/include/comphelper/scopeguard.hxx:36:14: +// error: function 'comphelper::<deduction guide for ScopeGuard><(lambda at +// /home/android/lo/master-android-arm/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx:146:34)>' +// has internal linkage but is not defined [-Werror,-Wundefined-internal] +// explicit ScopeGuard( Func && func ) : m_func( std::move(func) ) {} +// ^ +// /home/android/lo/master-android-arm/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx:146:28: +// note: used here +// comphelper::ScopeGuard guard([&]() { +// ^ +#ifdef ANDROID +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundefined-internal" +#endif +#endif + + namespace comphelper { /** ScopeGuard to ease writing exception-safe code. @@ -69,6 +91,12 @@ private: } // namespace comphelper +#ifdef ANDROID +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif + #endif // ! defined(INCLUDED_COMPHELPER_SCOPEGUARD_HXX) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |