From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Thu, 28 Jul 2022 16:01:55 +0000 (+0100)
Subject: Add missing 'std::' scope identifiers.
X-Git-Tag: archive/raspbian/29.0.6-20+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85313dd5404550e4c07a9a7334a4a50d1e83009f;p=android-platform-tools.git

Add missing 'std::' scope identifiers.

Forwarded: not-needed


Gbp-Pq: Topic art
Gbp-Pq: Name fix-standard-namespace-errors.patch
---

diff --git a/art/libdexfile/dex/compact_offset_table.h b/art/libdexfile/dex/compact_offset_table.h
index ec759e20..e651363f 100644
--- a/art/libdexfile/dex/compact_offset_table.h
+++ b/art/libdexfile/dex/compact_offset_table.h
@@ -28,7 +28,7 @@ class CompactOffsetTable {
  public:
   // This value is coupled with the leb chunk bitmask. That logic must also be adjusted when the
   // integer is modified.
-  static constexpr size_t kElementsPerIndex = 16;
+  static constexpr std::size_t kElementsPerIndex = 16;
 
   // Leb block format:
   // [uint16_t] 16 bit mask for what indexes actually have a non zero offset for the chunk.
@@ -61,7 +61,7 @@ class CompactOffsetTable {
                     uint32_t* out_table_offset);
 
   // 32 bit aligned for the offset table.
-  static constexpr size_t kAlignment = sizeof(uint32_t);
+  static constexpr std::size_t kAlignment = sizeof(uint32_t);
 };
 
 }  // namespace art
diff --git a/art/runtime/class_linker.cc b/art/runtime/class_linker.cc
index 4a4171e2..5420c8e1 100644
--- a/art/runtime/class_linker.cc
+++ b/art/runtime/class_linker.cc
@@ -3181,7 +3181,7 @@ struct ScopedDefiningClass {
     return Finish(h_klass);
   }
 
-  ObjPtr<mirror::Class> Finish(nullptr_t np ATTRIBUTE_UNUSED)
+  ObjPtr<mirror::Class> Finish(std::nullptr_t np ATTRIBUTE_UNUSED)
       REQUIRES_SHARED(Locks::mutator_lock_) {
     ScopedNullHandle<mirror::Class> snh;
     return Finish(snh);