| Index: webrtc/rtc_base/logging.cc
|
| diff --git a/webrtc/rtc_base/logging.cc b/webrtc/rtc_base/logging.cc
|
| index 4f46b0ad5279413b35ab971b54ca50564ec11554..d52bd7a4c96df3ab9656e0278f3732cc5dfaa322 100644
|
| --- a/webrtc/rtc_base/logging.cc
|
| +++ b/webrtc/rtc_base/logging.cc
|
| @@ -111,7 +111,7 @@ CriticalSection g_log_crit;
|
| // Note: we explicitly do not clean this up, because of the uncertain ordering
|
| // of destructors at program exit. Let the person who sets the stream trigger
|
| // cleanup by setting to null, or let it leak (safe at program exit).
|
| -LogMessage::StreamList LogMessage::streams_ GUARDED_BY(g_log_crit);
|
| +LogMessage::StreamList LogMessage::streams_ RTC_GUARDED_BY(g_log_crit);
|
|
|
| // Boolean options default to false (0)
|
| bool LogMessage::thread_, LogMessage::timestamp_;
|
| @@ -333,7 +333,8 @@ void LogMessage::ConfigureLogging(const char* params) {
|
| LogToDebug(debug_level);
|
| }
|
|
|
| -void LogMessage::UpdateMinLogSeverity() EXCLUSIVE_LOCKS_REQUIRED(g_log_crit) {
|
| +void LogMessage::UpdateMinLogSeverity()
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(g_log_crit) {
|
| LoggingSeverity min_sev = dbg_sev_;
|
| for (auto& kv : streams_) {
|
| min_sev = std::min(dbg_sev_, kv.second);
|
|
|