This commit is contained in:
gabime 2017-11-24 20:59:58 +02:00
parent fd170b0fe1
commit c41b6d28b5
5 changed files with 19 additions and 18 deletions

View File

@ -279,13 +279,13 @@ inline void spdlog::details::async_log_helper::worker_loop()
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch(...)
}
catch(...)
{
_err_handler("Unknown exeption in worker loop. Terminating worker loop");
active = false;
active = false;
}
}
}
if (_worker_teardown_cb) _worker_teardown_cb();

View File

@ -98,7 +98,7 @@ inline void spdlog::async_logger::_sink_it(details::log_msg& msg)
{
_err_handler(ex.what());
}
catch(...)
catch(...)
{
_err_handler("Unknown exception in logger " + _name);
throw;

View File

@ -77,10 +77,11 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
{
_err_handler(ex.what());
}
catch(...) {
_err_handler("Unknown exception in logger " + _name);
throw;
}
catch(...)
{
_err_handler("Unknown exception in logger " + _name);
throw;
}
}
template <typename... Args>
@ -96,7 +97,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
}
}
template<typename T>
@ -112,7 +113,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
}
}

View File

@ -526,7 +526,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
{
switch (flag)
{
// logger name
// logger name
case 'n':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
break;

View File

@ -488,7 +488,7 @@ template <typename Impl, typename Char, typename Spec = fmt::FormatSpec>
class BasicPrintfArgFormatter;
template <typename CharType,
typename ArgFormatter = fmt::ArgFormatter<CharType> >
typename ArgFormatter = fmt::ArgFormatter<CharType> >
class BasicFormatter;
/**
@ -2618,15 +2618,15 @@ inline uint64_t make_type(const T &arg)
}
template <std::size_t N, bool/*IsPacked*/= (N < ArgList::MAX_PACKED_ARGS)>
struct ArgArray;
struct ArgArray;
template <std::size_t N>
struct ArgArray<N, true/*IsPacked*/>
{
typedef Value Type[N > 0 ? N : 1];
template <typename Formatter, typename T>
static Value make(const T &value)
template <typename Formatter, typename T>
static Value make(const T &value)
{
#ifdef __clang__
Value result = MakeValue<Formatter>(value);
@ -2638,7 +2638,7 @@ static Value make(const T &value)
return MakeValue<Formatter>(value);
#endif
}
};
};
template <std::size_t N>
struct ArgArray<N, false/*IsPacked*/>
@ -3473,7 +3473,7 @@ void BasicWriter<Char>::write_double(T value, const Spec &spec)
// MSVC's printf doesn't support 'F'.
type = 'f';
#endif
// Fall through.
// Fall through.
case 'E':
case 'G':
case 'A':