]>
Commit | Line | Data |
---|---|---|
a74f78a4 JB |
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 | |
3 | @@ -38,6 +38,7 @@ | |
4 | # include <sys/mman.h> | |
5 | #endif | |
6 | ||
7 | +#include <memory> | |
8 | #include <iosfwd> | |
9 | #include <iomanip> | |
10 | #include <list> | |
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 | |
13 | @@ -183,7 +183,7 @@ | |
14 | return "crit"; | |
15 | default: | |
16 | ceph_abort(); | |
17 | - return 0; | |
18 | + return ""; | |
19 | } | |
20 | } | |
21 | ||
a74f78a4 JB |
22 | --- ceph-16.2.7/src/test/librados/tier_cxx.cc.orig 2022-01-19 09:30:47.209459506 -0500 |
23 | +++ ceph-16.2.7/src/test/librados/tier_cxx.cc 2022-01-19 10:02:47.783240298 -0500 | |
24 | @@ -114,7 +114,7 @@ | |
25 | #include "rgw/rgw_common.h" | |
26 | ||
27 | void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count, | |
28 | - std::string fp_algo = NULL) | |
29 | + std::string fp_algo = "") | |
30 | { | |
31 | bufferlist t; | |
32 | int size = foid.length(); | |
33 | @@ -142,7 +142,7 @@ | |
34 | ASSERT_LE(count, refs.count()); | |
35 | } | |
36 | ||
37 | -string get_fp_oid(string oid, std::string fp_algo = NULL) | |
38 | +string get_fp_oid(string oid, std::string fp_algo = "") | |
39 | { | |
40 | if (fp_algo == "sha1") { | |
41 | unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 1]; | |
42 | --- ceph-16.2.7/src/test/test_trans.cc.orig 2022-01-19 13:24:33.460008897 -0500 | |
43 | +++ ceph-16.2.7/src/test/test_trans.cc 2022-01-19 13:24:58.211554005 -0500 | |
44 | @@ -51,7 +51,7 @@ | |
45 | cout << "#dev " << filename << std::endl; | |
46 | cout << "#mb " << mb << std::endl; | |
47 | ||
48 | - ObjectStore *fs = new FileStore(cct.get(), filename, NULL); | |
49 | + ObjectStore *fs = new FileStore(cct.get(), filename, ""); | |
50 | if (fs->mount() < 0) { | |
51 | cout << "mount failed" << std::endl; | |
52 | return -1; | |
53 | --- ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h.orig 2022-02-11 17:21:40.268627997 -0500 | |
54 | +++ ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h 2022-02-11 17:21:57.155325437 -0500 | |
55 | @@ -466,7 +466,7 @@ | |
56 | ||
57 | std::string print(int ident) override | |
58 | { | |
59 | - return std::string(0); | |
60 | + return std::string(""); | |
61 | } | |
62 | ||
63 | void push_argument(base_statement* arg) |