ui/base/layout.cc - Issue 828633002: replace COMPILE_ASSERT with static_assert in ui/

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: ui/base/layout.cc

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

Patch Set: fix for rebase Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/base/layout.cc

diff --git a/ui/base/layout.cc b/ui/base/layout.cc

index 01c5b00dc72253623016e89742d1384985195365..5aaa7aa4e0006ec99b5b4791f631bb13b99b157b 100644

--- a/ui/base/layout.cc

+++ b/ui/base/layout.cc

@@ -32,8 +32,8 @@ std::vector<ScaleFactor>* g_supported_scale_factors = NULL;

const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f,

2.0f, 2.5f, 3.0f};

-COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),

- kScaleFactorScales_incorrect_size);

+static_assert(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),

+ "kScaleFactorScales has incorrect size");

} // namespace

« no previous file with comments | « ui/base/ime/win/imm32_manager.cc ('k') | ui/base/resource/data_pack.cc » ('j') | no next file with comments »