Skip to content

Commit ff41c35

Browse files
kevinwilfongfacebook-github-bot
authored andcommitted
fix: Moving a local variable in return statements in BingTileFunctions.h is causing builds to fail (facebookincubator#14190)
Summary: Pull Request resolved: facebookincubator#14190 Builds are currently failing with the following error message error: moving a local object in a return statement prevents copy elision [-Werror=pessimizing-move] referring to the lines recently added to BingTileFunctions.h which do return std::move(zoomCheck); The fix is to remove the std::move and let the compiler do it automatically. D78198453 introduced the code in question. Reviewed By: Sullivan-Patrick, HeidiHan0000, kgpai Differential Revision: D78769633 fbshipit-source-id: f87d967d51a8bd69f9ee131ace03663e2e3734ab
1 parent 8561e81 commit ff41c35

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

velox/functions/prestosql/BingTileFunctions.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ struct BingTileFunction {
5454
fmt::format("Bing tile Y coordinate {} cannot be negative", y));
5555
}
5656

57-
auto zoomCheck = checkBingTileZoom(zoom);
57+
Status zoomCheck = checkBingTileZoom(zoom);
5858
if (FOLLY_UNLIKELY(!zoomCheck.ok())) {
59-
return std::move(zoomCheck);
59+
return zoomCheck;
6060
}
6161

6262
uint64_t tile = BingTileType::bingTileCoordsToInt(
@@ -215,9 +215,9 @@ struct BingTileChildrenFunction {
215215
const arg_type<int32_t>& childZoom) {
216216
uint64_t tileInt = tile;
217217
VELOX_DCHECK(BingTileType::isBingTileIntValid(tileInt));
218-
auto zoomCheck = checkBingTileZoom(childZoom);
218+
Status zoomCheck = checkBingTileZoom(childZoom);
219219
if (FOLLY_UNLIKELY(!zoomCheck.ok())) {
220-
return std::move(zoomCheck);
220+
return zoomCheck;
221221
}
222222
auto childrenRes =
223223
BingTileType::bingTileChildren(tileInt, childZoom, maxZoomShift);
@@ -253,9 +253,9 @@ struct BingTileAtFunction {
253253
const arg_type<double>& latitude,
254254
const arg_type<double>& longitude,
255255
const arg_type<int32_t>& zoomLevel) {
256-
auto zoomCheck = checkBingTileZoom(zoomLevel);
256+
Status zoomCheck = checkBingTileZoom(zoomLevel);
257257
if (FOLLY_UNLIKELY(!zoomCheck.ok())) {
258-
return std::move(zoomCheck);
258+
return zoomCheck;
259259
}
260260
auto latitudeLongitudeToTileResult = BingTileType::latitudeLongitudeToTile(
261261
latitude, longitude, static_cast<uint8_t>(zoomLevel));
@@ -276,9 +276,9 @@ struct BingTilesAroundFunction {
276276
const arg_type<double>& latitude,
277277
const arg_type<double>& longitude,
278278
const arg_type<int32_t>& zoomLevel) {
279-
auto zoomCheck = checkBingTileZoom(zoomLevel);
279+
Status zoomCheck = checkBingTileZoom(zoomLevel);
280280
if (FOLLY_UNLIKELY(!zoomCheck.ok())) {
281-
return std::move(zoomCheck);
281+
return zoomCheck;
282282
}
283283
auto bingTilesAroundResult = BingTileType::bingTilesAround(
284284
latitude, longitude, static_cast<uint8_t>(zoomLevel));
@@ -297,9 +297,9 @@ struct BingTilesAroundFunction {
297297
const arg_type<double>& longitude,
298298
const arg_type<int32_t>& zoomLevel,
299299
const arg_type<double>& radiusInKm) {
300-
auto zoomCheck = checkBingTileZoom(zoomLevel);
300+
Status zoomCheck = checkBingTileZoom(zoomLevel);
301301
if (FOLLY_UNLIKELY(!zoomCheck.ok())) {
302-
return std::move(zoomCheck);
302+
return zoomCheck;
303303
}
304304
auto bingTilesAroundResult = BingTileType::bingTilesAround(
305305
latitude, longitude, static_cast<uint8_t>(zoomLevel), radiusInKm);

0 commit comments

Comments
 (0)