gcc13.patch

   1 From 796ce63667b460ba9b8d40891f30e45981ba237a Mon Sep 17 00:00:00 2001
   2 From: Tim Serong <tserong@suse.com>
   3 Date: Wed, 8 Mar 2023 13:53:29 +1100
   4 Subject: [PATCH 1/2] common, librbd, msg, test: fix FTBFS on gcc 13
   5
   6 This is based on 0024-gcc-13.patch from https://tracker.ceph.com/issues/58477
   7 but with an extra #include <cstdint> to avoid dropping std:: prefixes on
   8 integer types.
   9
  10 Fixes: https://tracker.ceph.com/issues/58477
  11 Signed-off-by: Tim Serong <tserong@suse.com>
  12 ---
  13  src/common/Cycles.h                | 2 ++
  14  src/librbd/api/PoolMetadata.h      | 1 +
  15  src/msg/async/compression_onwire.h | 1 +
  16  src/test/librados/op_speed.cc      | 2 ++
  17  src/test/mon/test_log_rss_usage.cc | 1 +
  18  5 files changed, 7 insertions(+)
  19
  20 diff --git a/src/common/Cycles.h b/src/common/Cycles.h
  21 index 16e0aa67fc144..b546479c2b351 100644
  22 --- a/src/common/Cycles.h
  23 +++ b/src/common/Cycles.h
  24 @@ -32,6 +32,8 @@
  25  #ifndef CEPH_CYCLES_H
  26  #define CEPH_CYCLES_H
  27
  28 +#include <cstdint>
  29 +
  30  /**
  31   * This class provides static methods that read the fine-grain CPU
  32   * cycle counter and translate between cycle-level times and absolute
  33 diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
  34 index c0a8173596e5c..69ab574ac7545 100644
  35 --- a/src/librbd/api/PoolMetadata.h
  36 +++ b/src/librbd/api/PoolMetadata.h
  37 @@ -7,6 +7,7 @@
  38  #include "include/buffer_fwd.h"
  39  #include "include/rados/librados_fwd.hpp"
  40
  41 +#include <cstdint>
  42  #include <map>
  43  #include <string>
  44
  45 diff --git a/src/msg/async/compression_onwire.h b/src/msg/async/compression_onwire.h
  46 index dcd6d26c4ca30..d3b35a4655c1b 100644
  47 --- a/src/msg/async/compression_onwire.h
  48 +++ b/src/msg/async/compression_onwire.h
  49 @@ -4,6 +4,7 @@
  50  #ifndef CEPH_COMPRESSION_ONWIRE_H
  51  #define CEPH_COMPRESSION_ONWIRE_H
  52
  53 +#include <cstdint>
  54  #include <optional>
  55
  56  #include "compressor/Compressor.h"
  57 diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
  58 index 90c7bdac571b8..849a6566f2d10 100644
  59 --- a/src/test/librados/op_speed.cc
  60 +++ b/src/test/librados/op_speed.cc
  61 @@ -1,6 +1,8 @@
  62  // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*
  63  // vim: ts=8 sw=2 smarttab
  64
  65 +#include <cstdint>
  66 +
  67  #include "include/rados/librados.hpp"
  68
  69  constexpr int to_create = 10'000'000;
  70 diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
  71 index f6e85f414c8e7..b8ca3012ab7c1 100644
  72 --- a/src/test/mon/test_log_rss_usage.cc
  73 +++ b/src/test/mon/test_log_rss_usage.cc
  74 @@ -1,4 +1,5 @@
  75  #include <sys/types.h>
  76 +#include <cstdint>
  77  #include <dirent.h>
  78  #include <errno.h>
  79  #include <vector>
  80