@@ -771,35 +771,34 @@ void ParallelContainerBase::liftSolution(const SolutionBase& solution, double co
771771 solution.start (), solution.end ());
772772}
773773
774- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & modified_solution, const SolutionBase& child_solution) {
774+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& modified_solution, const SolutionBase& child_solution) {
775775 // child_solution is correctly prepared by a child of this container
776776 assert (child_solution.creator ());
777777 assert (child_solution.creator ()->parent () == this );
778778
779- pimpl ()->liftSolution (std::move (modified_solution),
780- child_solution.start (), child_solution.end ());
779+ pimpl ()->liftSolution (modified_solution, child_solution.start (), child_solution.end ());
781780}
782781
783- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
782+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
784783 assert (child_solution.creator ());
785784 assert (child_solution.creator ()->parent () == this );
786785
787786 if (pimpl ()->requiredInterface () == GENERATE){
788787 // in this case we need a second InterfaceState to move from
789788 InterfaceState new_to{ new_propagated_state };
790- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
789+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
791790 }
792791 else {
793792 // pass new_propagated_state as start *and* end. We know at most one will be used.
794- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
793+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
795794 }
796795}
797796
798- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
797+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
799798 assert (child_solution.creator ());
800799 assert (child_solution.creator ()->parent () == this );
801800
802- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_from, &new_to);
801+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_from, &new_to);
803802}
804803
805804
0 commit comments