diff options
| author | mostynb <mostynb@opera.com> | 2015-01-06 12:13:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 20:14:35 +0000 |
| commit | 5a4acc21da29564a768351a4c05f159c2f18e19f (patch) | |
| tree | b9f2514280fb30d1debdcda4e6402e86f09b9578 /tools/android | |
| parent | 46adde154a7dd092f4988edbd84d375b7e22223f (diff) | |
| download | chromium_src-5a4acc21da29564a768351a4c05f159c2f18e19f.zip chromium_src-5a4acc21da29564a768351a4c05f159c2f18e19f.tar.gz chromium_src-5a4acc21da29564a768351a4c05f159c2f18e19f.tar.bz2 | |
replace COMPILE_ASSERT with static_assert in tools/
BUG=442514
Review URL: https://codereview.chromium.org/825323002
Cr-Commit-Position: refs/heads/master@{#310127}
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/forwarder2/common.h | 2 | ||||
| -rw-r--r-- | tools/android/memdump/memdump.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/android/forwarder2/common.h b/tools/android/forwarder2/common.h index 43de57b..37dfeac 100644 --- a/tools/android/forwarder2/common.h +++ b/tools/android/forwarder2/common.h @@ -80,7 +80,7 @@ class FixedSizeStringBuilder { char* write_ptr_; char buffer_[BufferSize]; - COMPILE_ASSERT(BufferSize >= 1, Size_of_buffer_must_be_at_least_one); + static_assert(BufferSize >= 1, "size of buffer must be at least one"); DISALLOW_COPY_AND_ASSIGN(FixedSizeStringBuilder); }; diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index cb4b05a..5ff459e 100644 --- a/tools/android/memdump/memdump.cc +++ b/tools/android/memdump/memdump.cc @@ -218,7 +218,7 @@ bool GetPagesForMemoryMap(int pagemap_fd, addr += kPageSize, ++page_index) { DCHECK_EQ(0, addr % kPageSize); PageMapEntry page_map_entry = {}; - COMPILE_ASSERT(sizeof(PageMapEntry) == sizeof(uint64), unexpected_size); + static_assert(sizeof(PageMapEntry) == sizeof(uint64), "unexpected size"); ssize_t bytes = read(pagemap_fd, &page_map_entry, sizeof(page_map_entry)); if (bytes != sizeof(PageMapEntry) && bytes != 0) { PLOG(ERROR) << "read"; |