components/content_settings/core/browser/content_settings_default_provider.cc - Issue 794683005: replace COMPILE_ASSERT with static_assert in components/

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: components/content_settings/core/browser/content_settings_default_provider.cc

Issue 794683005: replace COMPILE_ASSERT with static_assert in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: formatting fixup 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

« no previous file with comments | « components/captive_portal/captive_portal_types.cc ('k') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_default_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc

index 90b91a32ffde18660562af581c2044a5dbd9a299..53e9f8da5793dd580f30a604fa734f1de8e2cd95 100644

--- a/components/content_settings/core/browser/content_settings_default_provider.cc

+++ b/components/content_settings/core/browser/content_settings_default_provider.cc

@@ -55,8 +55,9 @@ const ContentSetting kDefaultSettings[] = {

CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER

#endif

};

-COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,

- default_settings_incorrect_size);

+static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,

+ "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES "

+ "elements");

} // namespace