@@ -781,35 +781,34 @@ void ParallelContainerBase::liftSolution(const SolutionBase& solution, double co
781781 solution.start (), solution.end ());
782782}
783783
784- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & modified_solution, const SolutionBase& child_solution) {
784+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& modified_solution, const SolutionBase& child_solution) {
785785 // child_solution is correctly prepared by a child of this container
786786 assert (child_solution.creator ());
787787 assert (child_solution.creator ()->parent () == this );
788788
789- pimpl ()->liftSolution (std::move (modified_solution),
790- child_solution.start (), child_solution.end ());
789+ pimpl ()->liftSolution (modified_solution, child_solution.start (), child_solution.end ());
791790}
792791
793- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
792+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
794793 assert (child_solution.creator ());
795794 assert (child_solution.creator ()->parent () == this );
796795
797796 if (pimpl ()->requiredInterface () == GENERATE){
798797 // in this case we need a second InterfaceState to move from
799798 InterfaceState new_to{ new_propagated_state };
800- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
799+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
801800 }
802801 else {
803802 // pass new_propagated_state as start *and* end. We know at most one will be used.
804- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
803+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
805804 }
806805}
807806
808- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
807+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
809808 assert (child_solution.creator ());
810809 assert (child_solution.creator ()->parent () == this );
811810
812- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_from, &new_to);
811+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_from, &new_to);
813812}
814813
815814
0 commit comments