3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-01-15 01:57:58 +08:00
Code Issues Projects Releases Wiki Activity

minidump: Use decltype(object) instead of typeof(object).

Browse Source 
TEST=minidump_test
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/681313005
This commit is contained in:
Mark Mentovai 2014-10-28 17:28:31 -04:00
parent 765e428321
commit 78bec65b27
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minidump/minidump_memory_writer.cc
View File

@ -76,7 +76,7 @@ bool MinidumpMemoryWriter::WillWriteAtOffsetImpl(off_t offset) {
DCHECK_GE(registered_memory_descriptors_.size(), 1u); DCHECK_GE(registered_memory_descriptors_.size(), 1u);
uint64_t base_address = MemoryRangeBaseAddress(); uint64_t base_address = MemoryRangeBaseAddress();
typeof(registered_memory_descriptors_[0]->StartOfMemoryRange) local_address; decltype(registered_memory_descriptors_[0]->StartOfMemoryRange) local_address;
if (!AssignIfInRange(&local_address, base_address)) { if (!AssignIfInRange(&local_address, base_address)) {
LOG(ERROR) << "base_address " << base_address << " out of range"; LOG(ERROR) << "base_address " << base_address << " out of range";
return false; return false;

10
minidump/minidump_module_writer.cc
View File

@ -47,7 +47,7 @@ MinidumpModuleCodeViewRecordPDBLinkWriter<CodeViewRecordType>::SizeOfObject() {
DCHECK_GE(state(), kStateFrozen); DCHECK_GE(state(), kStateFrozen);
// NUL-terminate. // NUL-terminate.
return offsetof(typeof(codeview_record_), pdb_name) + return offsetof(decltype(codeview_record_), pdb_name) +
(pdb_name_.size() + 1) * sizeof(pdb_name_[0]); (pdb_name_.size() + 1) * sizeof(pdb_name_[0]);
} }
@ -58,7 +58,7 @@ bool MinidumpModuleCodeViewRecordPDBLinkWriter<CodeViewRecordType>::WriteObject(
WritableIoVec iov; WritableIoVec iov;
iov.iov_base = &codeview_record_; iov.iov_base = &codeview_record_;
iov.iov_len = offsetof(typeof(codeview_record_), pdb_name); iov.iov_len = offsetof(decltype(codeview_record_), pdb_name);
std::vector<WritableIoVec> iovecs(1, iov); std::vector<WritableIoVec> iovecs(1, iov);
// NUL-terminate. // NUL-terminate.
@ -131,12 +131,12 @@ bool MinidumpModuleMiscDebugRecordWriter::Freeze() {
// NUL-terminate. // NUL-terminate.
if (!image_debug_misc_.Unicode) { if (!image_debug_misc_.Unicode) {
DCHECK(data_utf16_.empty()); DCHECK(data_utf16_.empty());
image_debug_misc_.Length = offsetof(typeof(image_debug_misc_), Data) + image_debug_misc_.Length = offsetof(decltype(image_debug_misc_), Data) +
(data_.size() + 1) * sizeof(data_[0]); (data_.size() + 1) * sizeof(data_[0]);
} else { } else {
DCHECK(data_.empty()); DCHECK(data_.empty());
image_debug_misc_.Length = image_debug_misc_.Length =
offsetof(typeof(image_debug_misc_), Data) + offsetof(decltype(image_debug_misc_), Data) +
(data_utf16_.size() + 1) * sizeof(data_utf16_[0]); (data_utf16_.size() + 1) * sizeof(data_utf16_[0]);
} }
@ -153,7 +153,7 @@ bool MinidumpModuleMiscDebugRecordWriter::WriteObject(
FileWriterInterface* file_writer) { FileWriterInterface* file_writer) {
DCHECK_EQ(state(), kStateWritable); DCHECK_EQ(state(), kStateWritable);
const size_t base_length = offsetof(typeof(image_debug_misc_), Data); const size_t base_length = offsetof(decltype(image_debug_misc_), Data);
WritableIoVec iov; WritableIoVec iov;
iov.iov_base = &image_debug_misc_; iov.iov_base = &image_debug_misc_;

2
minidump/minidump_writable.cc
View File

@ -180,7 +180,7 @@ size_t MinidumpWritable::WillWriteAtOffset(
} }
if (!registered_location_descriptors_.empty()) { if (!registered_location_descriptors_.empty()) {
typeof(registered_location_descriptors_[0]->DataSize) local_size; decltype(registered_location_descriptors_[0]->DataSize) local_size;
if (!AssignIfInRange(&local_size, size)) { if (!AssignIfInRange(&local_size, size)) {
LOG(ERROR) << "size " << size << " out of range"; LOG(ERROR) << "size " << size << " out of range";
return kInvalidSize; return kInvalidSize;