diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-29 02:35:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-29 02:35:21 +0000 |
| commit | ef33b5af6b6c19e22d23ef0d70402fa30da20bbd (patch) | |
| tree | 69c5b6c2253d521b1c26f1e6b4bb1cfe571c907e /icing/file/file-backed-vector.h | |
| parent | c3c0136ab9f7ecd83b8d0f53cb12a7079786ccf1 (diff) | |
| parent | 8f16167c39d77866a213b0ef042058e858255d47 (diff) | |
| download | icing-ef33b5af6b6c19e22d23ef0d70402fa30da20bbd.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into androidx-main" into androidx-main am: 8f16167c39
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1874071
Change-Id: I28b130b82b61861225dddd4fc958d1758dce839f
Diffstat (limited to 'icing/file/file-backed-vector.h')
| -rw-r--r-- | icing/file/file-backed-vector.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/icing/file/file-backed-vector.h b/icing/file/file-backed-vector.h index 0989935..00bdc7e 100644 --- a/icing/file/file-backed-vector.h +++ b/icing/file/file-backed-vector.h @@ -56,10 +56,9 @@ #ifndef ICING_FILE_FILE_BACKED_VECTOR_H_ #define ICING_FILE_FILE_BACKED_VECTOR_H_ -#include <inttypes.h> -#include <stdint.h> #include <sys/mman.h> +#include <cinttypes> #include <cstdint> #include <memory> #include <string> |