generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename NOTREACHED to RTC_NOTREACHED to avoid name conflict with Chromium

Browse Source 
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
This commit is contained in:
magjed@webrtc.org 2015-03-04 10:20:35 +00:00
parent 6dab6d700d
commit 9cd7c26d1a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/checks.h
View File

@ -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 {

10
webrtc/common_video/video_frame_buffer.cc
View File

@ -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;
}