1 --- ceph-16.2.7/src/include/buffer.h.orig 2022-01-17 12:17:19.193356237 -0500
2 +++ ceph-16.2.7/src/include/buffer.h 2022-01-17 12:17:58.599639592 -0500
11 --- ceph-16.2.7/src/common/LogEntry.cc.orig 2022-01-17 13:52:10.799134159 -0500
12 +++ ceph-16.2.7/src/common/LogEntry.cc 2022-01-17 13:52:47.244469274 -0500
22 --- ceph-16.2.7/src/common/dout.h.orig 2022-01-18 08:58:11.805226954 -0500
23 +++ ceph-16.2.7/src/common/dout.h 2022-01-19 08:06:23.987388663 -0500
26 struct dynamic_marker_t {
28 - operator T() const { return value; }
29 + // constexpr ctor isn't needed as it's an aggregate type
30 + constexpr operator T() const { return value; }
34 -dynamic_marker_t<T> need_dynamic(T&& t) {
35 +constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
36 + // deprecated in C++17 but that's fine for testing
37 + static_assert(std::is_literal_type_v<T>);
38 + static_assert(std::is_literal_type_v<dynamic_marker_t<T>>);
39 return dynamic_marker_t<T>{ std::forward<T>(t) };
42 --- ceph-16.2.7/src/test/librados/tier_cxx.cc.orig 2022-01-19 09:30:47.209459506 -0500
43 +++ ceph-16.2.7/src/test/librados/tier_cxx.cc 2022-01-19 10:02:47.783240298 -0500
45 #include "rgw/rgw_common.h"
47 void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count,
48 - std::string fp_algo = NULL)
49 + std::string fp_algo = "")
52 int size = foid.length();
54 ASSERT_LE(count, refs.count());
57 -string get_fp_oid(string oid, std::string fp_algo = NULL)
58 +string get_fp_oid(string oid, std::string fp_algo = "")
60 if (fp_algo == "sha1") {
61 unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 1];
62 --- ceph-16.2.7/src/test/test_trans.cc.orig 2022-01-19 13:24:33.460008897 -0500
63 +++ ceph-16.2.7/src/test/test_trans.cc 2022-01-19 13:24:58.211554005 -0500
65 cout << "#dev " << filename << std::endl;
66 cout << "#mb " << mb << std::endl;
68 - ObjectStore *fs = new FileStore(cct.get(), filename, NULL);
69 + ObjectStore *fs = new FileStore(cct.get(), filename, "");
70 if (fs->mount() < 0) {
71 cout << "mount failed" << std::endl;
73 --- ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h.orig 2022-02-11 17:21:40.268627997 -0500
74 +++ ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h 2022-02-11 17:21:57.155325437 -0500
77 std::string print(int ident) override
79 - return std::string(0);
80 + return std::string("");
83 void push_argument(base_statement* arg)