Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Side by Side Diff: sandbox/linux/seccomp-bpf/syscall_iterator.cc

Issue 821693003: replace COMPILE_ASSERT with static_assert in sandbox/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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:
View unified diff | Download patch
« no previous file with comments | « sandbox/linux/seccomp-bpf/syscall.cc ('k') | sandbox/linux/services/credentials.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sandbox/linux/seccomp-bpf/syscall_iterator.h" 5 #include "sandbox/linux/seccomp-bpf/syscall_iterator.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h" 9 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
10 10
11 namespace sandbox { 11 namespace sandbox {
12 12
13 namespace { 13 namespace {
14 14
15 #if defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32) 15 #if defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)
16 // This is true for Mips O32 ABI. 16 // This is true for Mips O32 ABI.
17 COMPILE_ASSERT(MIN_SYSCALL == __NR_Linux, min_syscall_should_be_4000); 17 static_assert(MIN_SYSCALL == __NR_Linux, "min syscall number should be 4000");
18 #else 18 #else
19 // This true for supported architectures (Intel and ARM EABI). 19 // This true for supported architectures (Intel and ARM EABI).
20 COMPILE_ASSERT(MIN_SYSCALL == 0u, min_syscall_should_always_be_zero); 20 static_assert(MIN_SYSCALL == 0u,
21 "min syscall should always be zero");
21 #endif 22 #endif
22 23
23 // SyscallRange represents an inclusive range of system call numbers. 24 // SyscallRange represents an inclusive range of system call numbers.
24 struct SyscallRange { 25 struct SyscallRange {
25 uint32_t first; 26 uint32_t first;
26 uint32_t last; 27 uint32_t last;
27 }; 28 };
28 29
29 const SyscallRange kValidSyscallRanges[] = { 30 const SyscallRange kValidSyscallRanges[] = {
30 // First we iterate up to MAX_PUBLIC_SYSCALL, which is equal to MAX_SYSCALL 31 // First we iterate up to MAX_PUBLIC_SYSCALL, which is equal to MAX_SYSCALL
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 DCHECK(lhs.set_ == rhs.set_); 135 DCHECK(lhs.set_ == rhs.set_);
135 return (lhs.done_ == rhs.done_) && (lhs.num_ == rhs.num_); 136 return (lhs.done_ == rhs.done_) && (lhs.num_ == rhs.num_);
136 } 137 }
137 138
138 bool operator!=(const SyscallSet::Iterator& lhs, 139 bool operator!=(const SyscallSet::Iterator& lhs,
139 const SyscallSet::Iterator& rhs) { 140 const SyscallSet::Iterator& rhs) {
140 return !(lhs == rhs); 141 return !(lhs == rhs);
141 } 142 }
142 143
143 } // namespace sandbox 144 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/linux/seccomp-bpf/syscall.cc ('k') | sandbox/linux/services/credentials.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698