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

Unified Diff: chrome/installer/util/installation_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/install_util.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installation_state.cc
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
index a926435daf1adb68031c689877059f4be5ae5de6..d2f3cb7f67d413b39d01b48c1b9d0a2df4c47ffc 100644
--- a/chrome/installer/util/installation_state.cc
+++ b/chrome/installer/util/installation_state.cc
@@ -224,12 +224,12 @@ InstallationState::InstallationState() {
// static
int InstallationState::IndexFromDistType(BrowserDistribution::Type type) {
- COMPILE_ASSERT(BrowserDistribution::CHROME_BROWSER == CHROME_BROWSER_INDEX,
- unexpected_chrome_browser_distribution_value_);
- COMPILE_ASSERT(BrowserDistribution::CHROME_FRAME == CHROME_FRAME_INDEX,
- unexpected_chrome_frame_distribution_value_);
- COMPILE_ASSERT(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX,
- unexpected_chrome_frame_distribution_value_);
+ static_assert(BrowserDistribution::CHROME_BROWSER == CHROME_BROWSER_INDEX,
+ "unexpected_chrome_browser_distribution_value_");
+ static_assert(BrowserDistribution::CHROME_FRAME == CHROME_FRAME_INDEX,
+ "unexpected_chrome_frame_distribution_value_");
+ static_assert(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX,
+ "unexpected_chrome_frame_distribution_value_");
DCHECK(type == BrowserDistribution::CHROME_BROWSER ||
type == BrowserDistribution::CHROME_FRAME ||
type == BrowserDistribution::CHROME_BINARIES);
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698