Merge pull request ceph#65791 from aainscow/fix_compiler_warnings

crimson/rgw: Fix clang compiler warnings.

Reviewed-by: Matan Breizman <[email protected]>
Reviewed-by: Edwin Rodriguez <[email protected]>

Author: aainscow

src/crimson/tools/store_bench/store-bench.cc

@@ -121,7 +121,7 @@ class StoreBenchWorkload {
 };
 
 
-class PGLogWorkload : public StoreBenchWorkload {
+class PGLogWorkload final : public StoreBenchWorkload {
   unsigned num_logs = 4;
   unsigned log_size = 1024;
   unsigned log_length = 256;
@@ -146,7 +146,7 @@ class PGLogWorkload : public StoreBenchWorkload {
   ~PGLogWorkload() final {}
 };
 
-class RGWIndexWorkload : public StoreBenchWorkload {
+class RGWIndexWorkload final : public StoreBenchWorkload {
   unsigned num_indices = 16;
   uint64_t key_size = 1024;
   uint64_t value_size = 1024;
@@ -581,7 +581,7 @@ seastar::future<results_t> RGWIndexWorkload::run(
  *
  * Performs a simple random write workload.
  */
-class RandomWriteWorkload : public StoreBenchWorkload {
+class RandomWriteWorkload final : public StoreBenchWorkload {
   uint64_t prefill_size = 128<<10;
   uint64_t io_size = 4<<10;
   uint64_t size_per_shard = 64<<20;

src/rgw/rgw_s3select_private.h

@@ -36,7 +36,10 @@
 #pragma GCC diagnostic push
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#if defined(__GNUC__) && !defined(__clang__)
+// Clang generates a warning due to this (-Wunknown-warning-option)
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
 #pragma clang diagnostic ignored "-Wdeprecated"
 #include <s3select/include/s3select.h>
 #pragma GCC diagnostic pop