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

Unified Diff: chrome/installer/util/installer_state.cc

Issue 1468803002: Switch to static_assert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assert1
Patch Set: message cleanup 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/installation_state.cc ('k') | chrome/installer/util/logging_installer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 2ca6119da475eb376335c003c625aeea11419bb1..d6175e5e3bc166fac935e5d8e24904de3349ca75 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -486,10 +486,13 @@ bool InstallerState::AnyExistsAndIsInUse(
};
DCHECK_NE(file_bits, 0U);
DCHECK_LT(file_bits, 1U << NUM_BINARIES);
- COMPILE_ASSERT(CHROME_DLL == 1, no_youre_out_of_order);
- COMPILE_ASSERT(CHROME_FRAME_DLL == 2, no_youre_out_of_order);
- COMPILE_ASSERT(CHROME_FRAME_HELPER_DLL == 4, no_youre_out_of_order);
- COMPILE_ASSERT(CHROME_FRAME_HELPER_EXE == 8, no_youre_out_of_order);
+ static_assert(CHROME_DLL == 1, "binary file names and values must match");
+ static_assert(CHROME_FRAME_DLL == 2,
+ "binary file names and values must match");
+ static_assert(CHROME_FRAME_HELPER_DLL == 4,
+ "binary file names and values must match");
+ static_assert(CHROME_FRAME_HELPER_EXE == 8,
+ "binary file names and values must match");
// Check only for the current version (i.e., the version we are upgrading
// _from_). Later versions from pending in-use updates need not be checked
« no previous file with comments | « chrome/installer/util/installation_state.cc ('k') | chrome/installer/util/logging_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698