From 9670af6eae8c517a52f2d3bb8b10ea19e9c7b640 Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Sat, 22 Jan 2022 00:23:15 +0900 Subject: [PATCH] Fix ftbfs for c++17 Closes: #983964 Gbp-Pq: Name Fix-ftbfs-for-c-17.patch --- libdexfile/dex/compact_offset_table.h | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- 2.30.2