From 796ce63667b460ba9b8d40891f30e45981ba237a Mon Sep 17 00:00:00 2001
From: Tim Serong <tserong@suse.com>
Date: Wed, 8 Mar 2023 13:53:29 +1100
Subject: [PATCH] common, librbd, msg, test: fix FTBFS on gcc 13

This is based on 0024-gcc-13.patch from https://tracker.ceph.com/issues/58477
but with an extra #include <cstdint> to avoid dropping std:: prefixes on
integer types.

Fixes: https://tracker.ceph.com/issues/58477
Signed-off-by: Tim Serong <tserong@suse.com>
---
 src/common/Cycles.h                | 2 ++
 src/librbd/api/PoolMetadata.h      | 1 +
 src/msg/async/compression_onwire.h | 1 +
 src/test/librados/op_speed.cc      | 2 ++
 src/test/mon/test_log_rss_usage.cc | 1 +
 5 files changed, 7 insertions(+)

diff --git a/src/common/Cycles.h b/src/common/Cycles.h
index 16e0aa67fc144..b546479c2b351 100644
--- a/src/common/Cycles.h
+++ b/src/common/Cycles.h
@@ -32,6 +32,8 @@
 #ifndef CEPH_CYCLES_H
 #define CEPH_CYCLES_H
 
+#include <cstdint>
+
 /**
  * This class provides static methods that read the fine-grain CPU
  * cycle counter and translate between cycle-level times and absolute
diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
index c0a8173596e5c..69ab574ac7545 100644
--- a/src/librbd/api/PoolMetadata.h
+++ b/src/librbd/api/PoolMetadata.h
@@ -7,6 +7,7 @@
 #include "include/buffer_fwd.h"
 #include "include/rados/librados_fwd.hpp"
 
+#include <cstdint>
 #include <map>
 #include <string>
 
diff --git a/src/msg/async/compression_onwire.h b/src/msg/async/compression_onwire.h
index dcd6d26c4ca30..d3b35a4655c1b 100644
--- a/src/msg/async/compression_onwire.h
+++ b/src/msg/async/compression_onwire.h
@@ -4,6 +4,7 @@
 #ifndef CEPH_COMPRESSION_ONWIRE_H
 #define CEPH_COMPRESSION_ONWIRE_H
 
+#include <cstdint>
 #include <optional>
 
 #include "compressor/Compressor.h"
diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
index 90c7bdac571b8..849a6566f2d10 100644
--- a/src/test/librados/op_speed.cc
+++ b/src/test/librados/op_speed.cc
@@ -1,6 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*
 // vim: ts=8 sw=2 smarttab
 
+#include <cstdint>
+
 #include "include/rados/librados.hpp"
 
 constexpr int to_create = 10'000'000;
diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
index f6e85f414c8e7..b8ca3012ab7c1 100644
--- a/src/test/mon/test_log_rss_usage.cc
+++ b/src/test/mon/test_log_rss_usage.cc
@@ -1,4 +1,5 @@
 #include <sys/types.h>
+#include <cstdint>
 #include <dirent.h>
 #include <errno.h>
 #include <vector>
-- 
2.39.5