Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Side by Side Diff: webrtc/base/thread.cc

Issue 1429513004: Switch usage of _DEBUG macro to NDEBUG. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: REBASE Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/taskrunner.cc ('k') | webrtc/base/unittest_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 338
339 bool Thread::SetAllowBlockingCalls(bool allow) { 339 bool Thread::SetAllowBlockingCalls(bool allow) {
340 ASSERT(IsCurrent()); 340 ASSERT(IsCurrent());
341 bool previous = blocking_calls_allowed_; 341 bool previous = blocking_calls_allowed_;
342 blocking_calls_allowed_ = allow; 342 blocking_calls_allowed_ = allow;
343 return previous; 343 return previous;
344 } 344 }
345 345
346 // static 346 // static
347 void Thread::AssertBlockingIsAllowedOnCurrentThread() { 347 void Thread::AssertBlockingIsAllowedOnCurrentThread() {
348 #ifdef _DEBUG 348 #if !defined(NDEBUG)
349 Thread* current = Thread::Current(); 349 Thread* current = Thread::Current();
350 ASSERT(!current || current->blocking_calls_allowed_); 350 ASSERT(!current || current->blocking_calls_allowed_);
351 #endif 351 #endif
352 } 352 }
353 353
354 void* Thread::PreRun(void* pv) { 354 void* Thread::PreRun(void* pv) {
355 ThreadInit* init = static_cast<ThreadInit*>(pv); 355 ThreadInit* init = static_cast<ThreadInit*>(pv);
356 ThreadManager::Instance()->SetCurrentThread(init->thread); 356 ThreadManager::Instance()->SetCurrentThread(init->thread);
357 rtc::SetCurrentThreadName(init->thread->name_.c_str()); 357 rtc::SetCurrentThreadName(init->thread->name_.c_str());
358 #if __has_feature(objc_arc) 358 #if __has_feature(objc_arc)
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 if (SUCCEEDED(hr)) { 599 if (SUCCEEDED(hr)) {
600 Thread::Run(); 600 Thread::Run();
601 CoUninitialize(); 601 CoUninitialize();
602 } else { 602 } else {
603 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr; 603 LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr;
604 } 604 }
605 } 605 }
606 #endif 606 #endif
607 607
608 } // namespace rtc 608 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/taskrunner.cc ('k') | webrtc/base/unittest_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698