Kaydet (Commit) f24e50c9 authored tarafından Mike Kaganski's avatar Mike Kaganski

Fix Android build after commit ac419786

... giving this error:

   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([&]() {
                              ^

See https://lists.freedesktop.org/archives/libreoffice/2019-April/082599.html

Change-Id: If719d183d2ce15fa4877cd8bbf457d79097765be
Reviewed-on: https://gerrit.libreoffice.org/71510Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst d32d9a2b
......@@ -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: */
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