chrome/installer/util/installation_state.cc - Issue 833513002: Revert of replace COMPILE_ASSERT with static_assert in chrome/installer/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 833513002: Revert of replace COMPILE_ASSERT with static_assert in chrome/installer/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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

Index: chrome/installer/util/installation_state.cc

diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc

index e55fcf5959d22dd7106983566669484ecd54da2d..0173581ec220133d50cccb1c006ebaa1430d2932 100644

--- a/chrome/installer/util/installation_state.cc

+++ b/chrome/installer/util/installation_state.cc

@@ -221,14 +221,14 @@

// static

int InstallationState::IndexFromDistType(BrowserDistribution::Type type) {

- 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 binaries distribution value");

- static_assert(BrowserDistribution::CHROME_APP_HOST == CHROME_APP_HOST_INDEX,

- "unexpected chrome app host distribution value");

+ 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_);

+ COMPILE_ASSERT(BrowserDistribution::CHROME_APP_HOST == CHROME_APP_HOST_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 »