Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 24 Jan 2023 21:40:43 -0800 |
| 4 | Subject: [PATCH] Add missing includes <cstdint> and <cstdio> |
| 5 | |
| 6 | This is needed with GCC 13 and newer [1] |
| 7 | |
| 8 | [1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html |
| 9 | |
| 10 | Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + |
| 14 | storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + |
| 15 | .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + |
| 16 | storage/rocksdb/rocksdb/util/slice.cc | 1 + |
| 17 | storage/rocksdb/rocksdb/util/string_util.h | 1 + |
| 18 | tpool/aio_linux.cc | 1 + |
| 19 | 6 files changed, 6 insertions(+) |
| 20 | |
| 21 | --- a/db/compaction/compaction_iteration_stats.h |
| 22 | +++ b/db/compaction/compaction_iteration_stats.h |
| 23 | @@ -7,6 +7,7 @@ |
| 24 | |
| 25 | #include <cstdint> |
| 26 | |
| 27 | +#include <cstdint> |
| 28 | #include "rocksdb/rocksdb_namespace.h" |
| 29 | |
| 30 | namespace ROCKSDB_NAMESPACE { |
| 31 | --- a/include/rocksdb/utilities/checkpoint.h |
| 32 | +++ b/include/rocksdb/utilities/checkpoint.h |
| 33 | @@ -8,6 +8,7 @@ |
| 34 | #pragma once |
| 35 | #ifndef ROCKSDB_LITE |
| 36 | |
| 37 | +#include <cstdint> |
| 38 | #include <string> |
| 39 | #include <vector> |
| 40 | |
| 41 | --- a/table/block_based/data_block_hash_index.h |
| 42 | +++ b/table/block_based/data_block_hash_index.h |
| 43 | @@ -5,6 +5,7 @@ |
| 44 | |
| 45 | #pragma once |
| 46 | |
| 47 | +#include <cstdint> |
| 48 | #include <string> |
| 49 | #include <vector> |
| 50 | |
| 51 | --- a/util/slice.cc |
| 52 | +++ b/util/slice.cc |
| 53 | @@ -12,6 +12,7 @@ |
| 54 | #include <stdio.h> |
| 55 | |
| 56 | #include <algorithm> |
| 57 | +#include <cstdint> |
| 58 | |
| 59 | #include "rocksdb/convenience.h" |
| 60 | #include "rocksdb/slice_transform.h" |
| 61 | --- a/util/string_util.h |
| 62 | +++ b/util/string_util.h |
| 63 | @@ -6,6 +6,7 @@ |
| 64 | |
| 65 | #pragma once |
| 66 | |
| 67 | +#include <cstdint> |
| 68 | #include <sstream> |
| 69 | #include <string> |
| 70 | #include <unordered_map> |