1Index: android-platform-system-core/libunwindstack/include/unwindstack/DwarfMemory.h
2===================================================================
3--- android-platform-system-core.orig/libunwindstack/include/unwindstack/DwarfMemory.h
4+++ android-platform-system-core/libunwindstack/include/unwindstack/DwarfMemory.h
5@@ -29,7 +29,7 @@ class DwarfMemory {
6   DwarfMemory(Memory* memory) : memory_(memory) {}
7   virtual ~DwarfMemory() = default;
8
9-  bool ReadBytes(void* dst, size_t num_bytes);
10+  bool ReadBytes(void* dst, std::size_t num_bytes);
11
12   template <typename SignedType>
13   bool ReadSigned(uint64_t* value);
14@@ -39,7 +39,7 @@ class DwarfMemory {
15   bool ReadSLEB128(int64_t* value);
16
17   template <typename AddressType>
18-  size_t GetEncodedSize(uint8_t encoding);
19+  std::size_t GetEncodedSize(uint8_t encoding);
20
21   bool AdjustEncodedValue(uint8_t encoding, uint64_t* value);
22
23