| 1 | From cddbfa3ade23695dd9996f6e208615702a3a42e1 Mon Sep 17 00:00:00 2001
|
| 2 | From: Liliana Marie Prikler <[email protected]>
|
| 3 | Date: Thu, 23 Nov 2023 09:53:38 +0100
|
| 4 | Subject: [PATCH 1/2] normalization: No longer work around compiler bugs in
|
| 5 | Precondition.
|
| 6 | To: Patrick Lühne <[email protected]>
|
| 7 | Cc: Martin Gebser <[email protected]>
|
| 8 |
|
| 9 | Newer versions of GCC (such as GCC 11) point out that std::move is meaningless
|
| 10 | in this position, so remove it.
|
| 11 | ---
|
| 12 | lib/pddl/src/pddl/detail/normalization/Precondition.cpp | 9 +++------
|
| 13 | 1 file changed, 3 insertions(+), 6 deletions(-)
|
| 14 |
|
| 15 | diff --git a/lib/pddl/src/pddl/detail/normalization/Precondition.cpp b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp
|
| 16 | index 4eebfee..4297e52 100644
|
| 17 | |
| 18 | |
| 19 | @@ -83,8 +83,7 @@ normalizedAST::Literal normalizeNested(ast::AndPointer<ast::Precondition> &and_,
|
| 20 |
|
| 21 | derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::And<normalizedAST::Literal>>(std::move(normalizedArguments));
|
| 22 |
|
| 23 | - // TODO: investigate, could be a compiler bug
|
| 24 | - return std::move(derivedPredicate);
|
| 25 | + return derivedPredicate;
|
| 26 | }
|
| 27 |
|
| 28 | ////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 29 | @@ -112,8 +111,7 @@ normalizedAST::Literal normalizeNested(ast::ExistsPointer<ast::Precondition> &ex
|
| 30 | return normalizeTopLevel(x, normalizationContext);
|
| 31 | });
|
| 32 |
|
| 33 | - // TODO: investigate, could be a compiler bug
|
| 34 | - return std::move(derivedPredicate);
|
| 35 | + return derivedPredicate;
|
| 36 | }
|
| 37 |
|
| 38 | ////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 39 | @@ -174,8 +172,7 @@ normalizedAST::Literal normalizeNested(ast::OrPointer<ast::Precondition> &or_, d
|
| 40 |
|
| 41 | derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::Or<normalizedAST::Literal>>(std::move(normalizedArguments));
|
| 42 |
|
| 43 | - // TODO: investigate, could be a compiler bug
|
| 44 | - return std::move(derivedPredicate);
|
| 45 | + return derivedPredicate;
|
| 46 | }
|
| 47 |
|
| 48 | ////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 49 | --
|
| 50 | 2.41.0
|
| 51 |
|