AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[base] Returns void case for all kinds of exceptions catcher.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2020-07-08 19:26:52 +03:00 • committed by mpimenov
parent 05cb521cb9
commit 33ac753452
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/exception.hpp
View file

@ -28,9 +28,11 @@ template <typename Fn, typename... Args>
std::result_of_t<Fn && (Args && ...)> ExceptionCatcher(std::string const & comment, Fn && fn,
Args &&... args) noexcept
{
bool constexpr isVoidReturned = std::is_same<std::result_of_t<Fn && (Args && ...)>, void>::value;
try
{
return std::forward<Fn>(fn)(std::forward<Args>(args)...);
if constexpr (!isVoidReturned)
return std::forward<Fn>(fn)(std::forward<Args>(args)...);
}
catch (RootException const & ex)
{
@ -44,7 +46,9 @@ std::result_of_t<Fn && (Args && ...)> ExceptionCatcher(std::string const & comme
{
LOG(LWARNING, ("Unknown exception.", comment));
}
return {};
if constexpr (!isVoidReturned)
return {};
}
#define DECLARE_EXCEPTION(exception_name, base_exception) \