Fix ftbfs for c++17

Closes: #983964
Gbp-Pq: Name Fix-ftbfs-for-c-17.patch

diff --git a/libdexfile/dex/compact_offset_table.h b/libdexfile/dex/compact_offset_table.h
index ec759e200d1bc45df564b97483f20e4328b7249f..e651363f3ba4768e4d8f098b9de9ae9a308fb2c4 100644 (file)
--- 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