From 84267877a094a00f763df6f717af554f35dad390 Mon Sep 17 00:00:00 2001 From: 4kangjc Date: Thu, 8 Jun 2023 23:43:33 +0800 Subject: [PATCH] fix: gcc13 compile failed --- include/pika_data_distribution.h | 2 +- src/pika_data_distribution.cc | 2 ++ src/pstd/src/pstd_status.cc | 1 + src/pstd/src/pstd_string.cc | 1 + src/storage/src/storage_murmur3.h | 4 ++-- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/pika_data_distribution.h b/include/pika_data_distribution.h index a3e71e0c3f..112411b890 100644 --- a/include/pika_data_distribution.h +++ b/include/pika_data_distribution.h @@ -7,7 +7,7 @@ #define PIKA_DATA_DISTRIBUTION_H_ #include -#include "pstd/include/pstd_status.h" +#include // polynomial reserved Crc32 magic num const uint32_t IEEE_POLY = 0xedb88320; diff --git a/src/pika_data_distribution.cc b/src/pika_data_distribution.cc index 1c6fb5c319..dae40ee6f8 100644 --- a/src/pika_data_distribution.cc +++ b/src/pika_data_distribution.cc @@ -5,6 +5,8 @@ #include "include/pika_data_distribution.h" +#include + const std::string kTagBegin = "{"; const std::string kTagEnd = "}"; diff --git a/src/pstd/src/pstd_status.cc b/src/pstd/src/pstd_status.cc index 7f16d1f3a2..c37dd8a65f 100644 --- a/src/pstd/src/pstd_status.cc +++ b/src/pstd/src/pstd_status.cc @@ -5,6 +5,7 @@ #include "pstd/include/pstd_status.h" #include #include +#include namespace pstd { diff --git a/src/pstd/src/pstd_string.cc b/src/pstd/src/pstd_string.cc index 9823f5e102..073498639b 100644 --- a/src/pstd/src/pstd_string.cc +++ b/src/pstd/src/pstd_string.cc @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/src/storage/src/storage_murmur3.h b/src/storage/src/storage_murmur3.h index 21868c9b0e..958c5dbf1a 100644 --- a/src/storage/src/storage_murmur3.h +++ b/src/storage/src/storage_murmur3.h @@ -15,8 +15,6 @@ // Microsoft Visual Studio -namespace storage { - #if defined(_MSC_VER) typedef unsigned char uint8_t; @@ -31,6 +29,8 @@ typedef unsigned __int64 uint64_t; #endif // !defined(_MSC_VER) +namespace storage { + #define FORCE_INLINE __attribute__((always_inline)) inline uint32_t rotl32(uint32_t x, uint8_t r) { return (x << r) | (x >> (32 - r)); }