From 9cd7c26d1a420dd98309cc040b37141d9ec7a6b2 Mon Sep 17 00:00:00 2001 From: "magjed@webrtc.org" Date: Wed, 4 Mar 2015 10:20:35 +0000 Subject: [PATCH] Rename NOTREACHED to RTC_NOTREACHED to avoid name conflict with Chromium R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/45459004 Cr-Commit-Position: refs/heads/master@{#8591} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8591 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/checks.h | 2 +- webrtc/common_video/video_frame_buffer.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webrtc/base/checks.h b/webrtc/base/checks.h index 82d6533991..823a310681 100644 --- a/webrtc/base/checks.h +++ b/webrtc/base/checks.h @@ -186,7 +186,7 @@ DEFINE_CHECK_OP_IMPL(GT, > ) #endif #define RTC_UNREACHABLE_CODE_HIT false -#define NOTREACHED() DCHECK(RTC_UNREACHABLE_CODE_HIT) +#define RTC_NOTREACHED() DCHECK(RTC_UNREACHABLE_CODE_HIT) // This is identical to LogMessageVoidify but in name. class FatalMessageVoidify { diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc index 29048e98f4..76e97b7e47 100644 --- a/webrtc/common_video/video_frame_buffer.cc +++ b/webrtc/common_video/video_frame_buffer.cc @@ -64,7 +64,7 @@ const uint8_t* I420Buffer::data(PlaneType type) const { return data_.get() + stride_y_ * height_ + stride_u_ * ((height_ + 1) / 2); default: - NOTREACHED(); + RTC_NOTREACHED(); return nullptr; } } @@ -84,7 +84,7 @@ int I420Buffer::stride(PlaneType type) const { case kVPlane: return stride_v_; default: - NOTREACHED(); + RTC_NOTREACHED(); return 0; } } @@ -115,17 +115,17 @@ int TextureBuffer::height() const { } const uint8_t* TextureBuffer::data(PlaneType type) const { - NOTREACHED(); // Should not be called. + RTC_NOTREACHED(); // Should not be called. return nullptr; } uint8_t* TextureBuffer::data(PlaneType type) { - NOTREACHED(); // Should not be called. + RTC_NOTREACHED(); // Should not be called. return nullptr; } int TextureBuffer::stride(PlaneType type) const { - NOTREACHED(); // Should not be called. + RTC_NOTREACHED(); // Should not be called. return 0; }