admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add last error to fatal error messages.

Browse Source 
This requires including logging.h, which in turn pointed out a problem with our 'LOG_TAG' macro, so that macro is now renamed.

BUG=

Review URL: https://codereview.webrtc.org/1911903002

Cr-Commit-Position: refs/heads/master@{#12464}
This commit is contained in:
tommi 2016-04-22 01:22:24 -07:00 committed by Commit bot
parent bfde543f73
commit e8be6ff65d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/base/checks.cc
View File

@ -22,11 +22,16 @@
#endif
#if defined(WEBRTC_ANDROID)
#define LOG_TAG "rtc"
#define RTC_LOG_TAG "rtc"
#include <android/log.h> // NOLINT
#endif
#if defined(WEBRTC_WIN)
#include <windows.h>
#endif
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#if defined(_MSC_VER)
// Warning C4722: destructor never returns, potential memory leak.
@ -38,7 +43,7 @@ namespace rtc {
void VPrintError(const char* format, va_list args) {
#if defined(WEBRTC_ANDROID)
__android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, args);
__android_log_vprint(ANDROID_LOG_ERROR, RTC_LOG_TAG, format, args);
#else
vfprintf(stderr, format, args);
#endif
@ -105,8 +110,11 @@ NO_RETURN FatalMessage::~FatalMessage() {
}
void FatalMessage::Init(const char* file, int line) {
stream_ << std::endl << std::endl << "#" << std::endl << "# Fatal error in "
<< file << ", line " << line << std::endl << "# ";
stream_ << std::endl << std::endl
<< "#" << std::endl
<< "# Fatal error in " << file << ", line " << line << std::endl
<< "# last system error: " << LAST_SYSTEM_ERROR << std::endl
<< "# ";
}
// MSVC doesn't like complex extern templates and DLLs.