fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 03:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Logging functions defined with UAVCAN_NOEXCEPT

Browse Source
This commit is contained in:
Pavel Kirienko
2015-02-05 02:31:28 +03:00
parent 60cf13995a
commit 035a607944
3 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/protocol/uc_logger.cpp
+18 -7
View File
@@ -36,16 +36,27 @@ int Logger::log(const protocol::debug::LogMessage& message)
#if UAVCAN_CPP_VERSION < UAVCAN_CPP11
int Logger::log(LogLevel level, const char* source, const char* text)
int Logger::log(LogLevel level, const char* source, const char* text) UAVCAN_NOEXCEPT
{
if (level >= level_ || level >= getExternalSinkLevel())
#if UAVCAN_EXCEPTIONS
try
#endif
{
msg_buf_.level.value = level;
msg_buf_.source = source;
msg_buf_.text = text;
return log(msg_buf_);
if (level >= level_ || level >= getExternalSinkLevel())
{
msg_buf_.level.value = level;
msg_buf_.source = source;
msg_buf_.text = text;
return log(msg_buf_);
}
return 0;
}
return 0;
#if UAVCAN_EXCEPTIONS
catch (...)
{
return -ErrFailure;
}
#endif
}
#endif