0a710c5c44
...afteraa5ee0085c"Stop swallowing exceptions in ~ScopeGuard" had dropped the catch blocks from ~ScopeGuard to make it usable in Library_salhelper in0c1c300ed7"Rather use ScopeGuard to prevent catch and rethrow". But using the original suppress_fun_call_w_exception, which used css::uno::Exception, would have caused the same circular-dependency issue again thataa5ee0085chad solved, so drop the use of css::uno::Exception (and SAL_WARN, which triggered a number of missing #include <sal/log.hxx>) also from suppress_fun_call_w_exception. After all, that was __COVERITY__-only code that wasn't meant to be actually run, so it shouldn't matter if we just catch everything and silently terminate. Change-Id: If28a214709e4636e1c23a49f2d95d87c91492f14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126404 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
92 lines
2.9 KiB
C++
92 lines
2.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_COMPHELPER_SCOPEGUARD_HXX
|
|
#define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <utility>
|
|
|
|
#include <o3tl/deleter.hxx>
|
|
|
|
// 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.
|
|
*/
|
|
template <class Func> class ScopeGuard
|
|
{
|
|
public:
|
|
/** @param func function object to be executed in dtor
|
|
*/
|
|
explicit ScopeGuard( Func && func ) : m_func( std::move(func) ) {}
|
|
|
|
~ScopeGuard()
|
|
{
|
|
if (m_bDismissed)
|
|
return;
|
|
suppress_fun_call_w_exception(m_func());
|
|
}
|
|
|
|
/** Dismisses the scope guard, i.e. the function won't
|
|
be executed.
|
|
*/
|
|
void dismiss() { m_bDismissed = true; }
|
|
|
|
private:
|
|
// noncopyable until we have good reasons...
|
|
ScopeGuard(const ScopeGuard&) = delete;
|
|
ScopeGuard& operator=(const ScopeGuard&) = delete;
|
|
|
|
Func m_func;
|
|
bool m_bDismissed = false;
|
|
};
|
|
|
|
} // 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: */
|