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

Unified Diff: media/cdm/ppapi/cdm_wrapper.h

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/cdm/ppapi/cdm_adapter.cc ('k') | media/cdm/ppapi/supported_cdm_versions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/cdm_wrapper.h
diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h
index 4cc54ed86482c9dd41a4a95eb4bf4b9b61f001e5..7ebd6805733cd188d4adcdede11480a1902ad77d 100644
--- a/media/cdm/ppapi/cdm_wrapper.h
+++ b/media/cdm/ppapi/cdm_wrapper.h
@@ -242,9 +242,9 @@ CdmWrapper* CdmWrapper::Create(const char* key_system,
uint32_t key_system_size,
GetCdmHostFunc get_cdm_host_func,
void* user_data) {
- COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==
- cdm::ContentDecryptionModule_6::kVersion,
- update_code_below);
+ static_assert(cdm::ContentDecryptionModule::kVersion ==
+ cdm::ContentDecryptionModule_6::kVersion,
+ "update the code below");
// Ensure IsSupportedCdmInterfaceVersion() matches this implementation.
// Always update this DCHECK when updating this function.
@@ -272,9 +272,9 @@ CdmWrapper* CdmWrapper::Create(const char* key_system,
// stub implementations for new or modified methods that the older CDM interface
// does not have.
// Also update supported_cdm_versions.h.
-COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==
- cdm::ContentDecryptionModule_6::kVersion,
- ensure_cdm_wrapper_templates_have_old_version_support);
+static_assert(cdm::ContentDecryptionModule::kVersion ==
+ cdm::ContentDecryptionModule_6::kVersion,
+ "ensure cdm wrapper templates have old version support");
} // namespace media
« no previous file with comments | « media/cdm/ppapi/cdm_adapter.cc ('k') | media/cdm/ppapi/supported_cdm_versions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698