net/dns/dns_config_service_posix.cc - Issue 826973002: replace COMPILE_ASSERT with static_assert in net/

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: net/dns/dns_config_service_posix.cc

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

Patch Set: apply fixups 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: net/dns/dns_config_service_posix.cc

diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc

index 6b79f9c2e0a17051f4376359e53469fbbd54d6fe..42582bea125a6857e16c0fa6f5da20dc27fd17cd 100644

--- a/net/dns/dns_config_service_posix.cc

+++ b/net/dns/dns_config_service_posix.cc

@@ -411,9 +411,9 @@ ConfigParsePosixResult ConvertResStateToDnsConfig(const struct __res_state& res,

dns_config->nameservers.push_back(ipe);

}

#elif defined(OS_LINUX)

- COMPILE_ASSERT(arraysize(res.nsaddr_list) >= MAXNS &&

- arraysize(res._u._ext.nsaddrs) >= MAXNS,

- incompatible_libresolv_res_state);

+ static_assert(arraysize(res.nsaddr_list) >= MAXNS &&

+ arraysize(res._u._ext.nsaddrs) >= MAXNS,

+ "incompatible libresolv res_state");

DCHECK_LE(res.nscount, MAXNS);

// Initially, glibc stores IPv6 in |_ext.nsaddrs| and IPv4 in |nsaddr_list|.

// In res_send.c:res_nsend, it merges |nsaddr_list| into |nsaddrs|,

« no previous file with comments | « net/disk_cache/simple/simple_test_util.h ('k') | net/dns/dns_session.cc » ('j') | no next file with comments »