From 9738dee98df4cff061e2c09268364eccd00b4a7c Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Thu, 13 Oct 2022 19:56:25 +0100 Subject: [PATCH] Add missing 'std::' scope identifiers. Forwarded: not-needed Gbp-Pq: Name fix-standard-namespace-errors.patch --- libdexfile/dex/compact_offset_table.h | 4 ++-- runtime/class_linker.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libdexfile/dex/compact_offset_table.h b/libdexfile/dex/compact_offset_table.h index ec759e2..e651363 100644 --- a/libdexfile/dex/compact_offset_table.h +++ b/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/runtime/class_linker.cc b/runtime/class_linker.cc index c39c5be..6f3ae1d 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -3180,7 +3180,7 @@ struct ScopedDefiningClass { return Finish(h_klass); } - ObjPtr Finish(nullptr_t np ATTRIBUTE_UNUSED) + ObjPtr Finish(std::nullptr_t np ATTRIBUTE_UNUSED) REQUIRES_SHARED(Locks::mutator_lock_) { ScopedNullHandle snh; return Finish(snh); -- 2.30.2