From 4e82b6fa11d0ca0b3d4f7afead32c1eb009f4c9b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 17 Feb 2017 00:25:04 -0500 Subject: minidump: mark Read as override in derived classes The base class here declares Read as virtual, so make sure it's marked as override in the derived classes. This fixes some build errors with clang. src/google_breakpad/processor/minidump.h:853:8: error: 'Read' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] bool Read(uint32_t expected_size_); ^ src/google_breakpad/processor/minidump.h:153:16: note: overridden virtual function is here virtual bool Read(uint32_t expected_size) = 0; ^ Change-Id: Ie4e5fec097b7f37739433a9deb39e7ed60471461 Reviewed-on: https://chromium-review.googlesource.com/444385 Reviewed-by: Tobias Sargeant --- src/google_breakpad/processor/minidump.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/google_breakpad') diff --git a/src/google_breakpad/processor/minidump.h b/src/google_breakpad/processor/minidump.h index bff38bf3..a5d32c8b 100644 --- a/src/google_breakpad/processor/minidump.h +++ b/src/google_breakpad/processor/minidump.h @@ -350,7 +350,7 @@ class MinidumpThreadList : public MinidumpStream { static const uint32_t kStreamType = MD_THREAD_LIST_STREAM; - bool Read(uint32_t aExpectedSize); + bool Read(uint32_t aExpectedSize) override; // The largest number of threads that will be read from a minidump. The // default is 256. @@ -592,7 +592,7 @@ class MinidumpMemoryList : public MinidumpStream { explicit MinidumpMemoryList(Minidump* minidump); - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; // The largest number of memory regions that will be read from a minidump. // The default is 256. @@ -647,7 +647,7 @@ class MinidumpException : public MinidumpStream { explicit MinidumpException(Minidump* minidump); - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; MDRawExceptionStream exception_; MinidumpContext* context_; @@ -687,7 +687,7 @@ class MinidumpAssertion : public MinidumpStream { explicit MinidumpAssertion(Minidump* minidump); - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; MDRawAssertionInfo assertion_; string expression_; @@ -744,7 +744,7 @@ class MinidumpSystemInfo : public MinidumpStream { static const uint32_t kStreamType = MD_SYSTEM_INFO_STREAM; - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; // A string identifying the CPU vendor, if known. const string* cpu_vendor_; @@ -849,8 +849,7 @@ class MinidumpUnloadedModuleList : public MinidumpStream, static const uint32_t kStreamType = MD_UNLOADED_MODULE_LIST_STREAM; - - bool Read(uint32_t expected_size_); + bool Read(uint32_t expected_size_) override; // The largest number of modules that will be read from a minidump. The // default is 1024. @@ -886,7 +885,7 @@ class MinidumpMiscInfo : public MinidumpStream { explicit MinidumpMiscInfo(Minidump* minidump_); - bool Read(uint32_t expected_size_); + bool Read(uint32_t expected_size_) override; MDRawMiscInfo misc_info_; @@ -927,7 +926,7 @@ class MinidumpBreakpadInfo : public MinidumpStream { explicit MinidumpBreakpadInfo(Minidump* minidump_); - bool Read(uint32_t expected_size_); + bool Read(uint32_t expected_size_) override; MDRawBreakpadInfo breakpad_info_; @@ -995,7 +994,7 @@ class MinidumpMemoryInfoList : public MinidumpStream { explicit MinidumpMemoryInfoList(Minidump* minidump_); - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; // Access to memory info using addresses as the key. RangeMap *range_map_; @@ -1090,7 +1089,7 @@ class MinidumpLinuxMapsList : public MinidumpStream { // Read and load the contents of the process mapping data. // The stream should have data in the form of /proc/self/maps. // This method returns whether the stream was read successfully. - bool Read(uint32_t expected_size); + bool Read(uint32_t expected_size) override; // The list of individual mappings. MinidumpLinuxMappings *maps_; -- cgit v1.2.1