From 9fb6e5bb05b35a2d4ffe3a87e31b67424db28226 Mon Sep 17 00:00:00 2001
From: Xiaoge Su <magichp@gmail.com>
Date: Tue, 14 Jun 2022 11:17:17 -0700
Subject: [PATCH] fixup! Fix the clang error when using std::move
This patch is to fix the compile error
/root/src/fdbclient/S3BlobStore.actor.cpp:410:9: error: moving a local
object in a return statement prevents copy elision
[-Werror,-Wpessimizing-move]
return std::move(resource);
^
/root/src/fdbclient/S3BlobStore.actor.cpp:410:9: note: remove std::move
call here
return std::move(resource);
^~~~~~~~~~ ~
1 error generated.
---
fdbclient/S3BlobStore.actor.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fdbclient/S3BlobStore.actor.cpp b/fdbclient/S3BlobStore.actor.cpp
index 49ad61fd33..1a7cfe40da 100644
--- a/fdbclient/S3BlobStore.actor.cpp
+++ b/fdbclient/S3BlobStore.actor.cpp
@@ -395,7 +395,7 @@ std::string S3BlobStoreEndpoint::getResourceURL(std::string resource, std::strin
return r;
}
-std::string constructResourcePath(Reference<S3BlobStoreEndpoint> b, std::string bucket, std::string object) {
+std::string constructResourcePath(Reference<S3BlobStoreEndpoint> b, const std::string& bucket, const std::string& object) {
std::string resource;
if (b->getHost().find(bucket + ".") != 0) {
@@ -407,7 +407,7 @@ std::string constructResourcePath(Reference<S3BlobStoreEndpoint> b, std::string
resource += object;
}
- return std::move(resource);
+ return resource;
}
ACTOR Future<bool> bucketExists_impl(Reference<S3BlobStoreEndpoint> b, std::string bucket) {