From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Fri, 20 Jan 2023 08:36:41 +0000 (+0000)
Subject: Add missing 'std::' scope identifiers.
X-Git-Tag: archive/raspbian/29.0.6-23+rpi1^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e569e29bf69cf46cd7a2398d2a8676b110c2ca08;p=android-platform-tools.git

Add missing 'std::' scope identifiers.

Forwarded: not-needed


Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-standard-namespace-errors.patch
---

diff --git a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h b/system/core/libunwindstack/include/unwindstack/DwarfMemory.h
index c45699a9..7d95d486 100644
--- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h
+++ b/system/core/libunwindstack/include/unwindstack/DwarfMemory.h
@@ -29,7 +29,7 @@ class DwarfMemory {
   DwarfMemory(Memory* memory) : memory_(memory) {}
   virtual ~DwarfMemory() = default;
 
-  bool ReadBytes(void* dst, size_t num_bytes);
+  bool ReadBytes(void* dst, std::size_t num_bytes);
 
   template <typename SignedType>
   bool ReadSigned(uint64_t* value);
@@ -39,7 +39,7 @@ class DwarfMemory {
   bool ReadSLEB128(int64_t* value);
 
   template <typename AddressType>
-  size_t GetEncodedSize(uint8_t encoding);
+  std::size_t GetEncodedSize(uint8_t encoding);
 
   bool AdjustEncodedValue(uint8_t encoding, uint64_t* value);