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

Unified Diff: media/blink/webmediasource_impl.cc

Issue 826953002: replace COMPILE_ASSERT with static_assert in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 11 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_util.cc ('k') | media/cast/receiver/audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediasource_impl.cc
diff --git a/media/blink/webmediasource_impl.cc b/media/blink/webmediasource_impl.cc
index aecad6f307f491bc8fb07bddbc20df125c0f10ed..d67ca6d7d7f8235efe6f86727ff6ede197372990 100644
--- a/media/blink/webmediasource_impl.cc
+++ b/media/blink/webmediasource_impl.cc
@@ -15,14 +15,14 @@ using ::blink::WebMediaSource;
namespace media {
-#define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
- COMPILE_ASSERT(static_cast<int>(WebMediaSource::webkit_name) == \
- static_cast<int>(ChunkDemuxer::chromium_name), \
- mismatching_status_enums)
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
-#undef COMPILE_ASSERT_MATCHING_STATUS_ENUM
+#define STATIC_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
+ static_assert(static_cast<int>(WebMediaSource::webkit_name) == \
+ static_cast<int>(ChunkDemuxer::chromium_name), \
+ "mismatching status enum values: " #webkit_name)
+STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
+STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
+STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
+#undef STATIC_ASSERT_MATCHING_STATUS_ENUM
WebMediaSourceImpl::WebMediaSourceImpl(
ChunkDemuxer* demuxer, LogCB log_cb)
« no previous file with comments | « media/blink/webmediaplayer_util.cc ('k') | media/cast/receiver/audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698