@@ -782,35 +782,34 @@ void ParallelContainerBase::liftSolution(const SolutionBase& solution, double co
782782 solution.start (), solution.end ());
783783}
784784
785- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & modified_solution, const SolutionBase& child_solution) {
785+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& modified_solution, const SolutionBase& child_solution) {
786786 // child_solution is correctly prepared by a child of this container
787787 assert (child_solution.creator ());
788788 assert (child_solution.creator ()->parent () == this );
789789
790- pimpl ()->liftSolution (std::move (modified_solution),
791- child_solution.start (), child_solution.end ());
790+ pimpl ()->liftSolution (modified_solution, child_solution.start (), child_solution.end ());
792791}
793792
794- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
793+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_propagated_state, const SolutionBase& child_solution) {
795794 assert (child_solution.creator ());
796795 assert (child_solution.creator ()->parent () == this );
797796
798797 if (pimpl ()->requiredInterface () == GENERATE){
799798 // in this case we need a second InterfaceState to move from
800799 InterfaceState new_to{ new_propagated_state };
801- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
800+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_to);
802801 }
803802 else {
804803 // pass new_propagated_state as start *and* end. We know at most one will be used.
805- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
804+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_propagated_state, &new_propagated_state);
806805 }
807806}
808807
809- void ParallelContainerBase::liftModifiedSolution (SolutionBasePtr& & new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
808+ void ParallelContainerBase::liftModifiedSolution (const SolutionBasePtr& new_solution, InterfaceState&& new_from, InterfaceState&& new_to, const SolutionBase& child_solution) {
810809 assert (child_solution.creator ());
811810 assert (child_solution.creator ()->parent () == this );
812811
813- pimpl ()->liftSolution (std::move ( new_solution) , child_solution.start (), child_solution.end (), &new_from, &new_to);
812+ pimpl ()->liftSolution (new_solution, child_solution.start (), child_solution.end (), &new_from, &new_to);
814813}
815814
816815
0 commit comments