ui/base/x/selection_requestor.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/x/selection_requestor.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/x/selection_requestor.cc

diff --git a/ui/base/x/selection_requestor.cc b/ui/base/x/selection_requestor.cc

index 5cab04fd91e46f5e0e2cf5478b182e07f09dade8..977de29f4b8298703b9a7409f75f27a0712e34d6 100644

--- a/ui/base/x/selection_requestor.cc

+++ b/ui/base/x/selection_requestor.cc

@@ -34,8 +34,8 @@ const int kTimerPeriodMs = 100;

// The amount of time to wait for a request to complete before aborting it.

const int kRequestTimeoutMs = 10000;

-COMPILE_ASSERT(kTimerPeriodMs <= kRequestTimeoutMs,

- timer_period_must_be_less_or_equal_to_request_timeout);

+static_assert(kTimerPeriodMs <= kRequestTimeoutMs,

+ "timer period must be <= request timeout");

// Combines |data| into a single RefCountedMemory object.

scoped_refptr<base::RefCountedMemory> CombineRefCountedMemory(