chrome/installer/util/installer_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/installer_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/installer_state.cc

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

index c767a3c9481b665a29b4488c55ef67ff659a5f5c..d2042776d45ac9b42f87af809146f322ac37e5a4 100644

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

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

@@ -620,10 +620,10 @@

};

DCHECK_NE(file_bits, 0U);

DCHECK_LT(file_bits, 1U << NUM_BINARIES);

- static_assert(CHROME_DLL == 1, "no, you're out of order");

- static_assert(CHROME_FRAME_DLL == 2, "no, you're out of order");

- static_assert(CHROME_FRAME_HELPER_DLL == 4, "no, you're out of order");

- static_assert(CHROME_FRAME_HELPER_EXE == 8, "no, you're out of order");

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

// 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 »