From 6d30f64eedacf34639819d1fdcdac32d5f6409d7 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 29 Jan 2025 22:02:33 +0100 Subject: [PATCH 1/2] Fix compilation further to lifecycle v25.06 --- BeamAdapter_test/BeamInterpolation_test.cpp | 1 - .../constraint/AdaptiveBeamSlidingConstraintTest.cpp | 3 +-- .../component/mapping/BeamLengthMappingTest.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/BeamAdapter_test/BeamInterpolation_test.cpp b/BeamAdapter_test/BeamInterpolation_test.cpp index 6f51a19dc..7724bfe8f 100644 --- a/BeamAdapter_test/BeamInterpolation_test.cpp +++ b/BeamAdapter_test/BeamInterpolation_test.cpp @@ -43,7 +43,6 @@ using sofa::simulation::SceneLoaderXML; using sofa::simulation::graph::DAGSimulation; using sofa::simulation::Simulation ; using sofa::simulation::Node ; -using sofa::simulation::setSimulation ; using sofa::core::objectmodel::New ; using sofa::core::objectmodel::BaseData ; using sofa::component::statecontainer::MechanicalObject ; diff --git a/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp b/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp index 7128c939b..3a20b5b40 100644 --- a/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp +++ b/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp @@ -39,8 +39,7 @@ using sofa::simulation::SceneLoaderXML ; using sofa::simulation::graph::DAGSimulation; using sofa::simulation::Simulation ; using sofa::simulation::Node ; -using sofa::simulation::setSimulation ; -using sofa::core::objectmodel::New ; + using sofa::core::objectmodel::New ; using sofa::core::objectmodel::BaseData ; using sofa::component::statecontainer::MechanicalObject ; diff --git a/BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp b/BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp index 58b936186..e49241807 100644 --- a/BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp +++ b/BeamAdapter_test/component/mapping/BeamLengthMappingTest.cpp @@ -151,10 +151,10 @@ struct BeamLengthMappingTest : public sofa::mapping_test::Mapping_test<_BeamLeng this->root->getTreeObject(ToModel); this->outDofs= ToModel; - const Data& dataInX = *FromModel->read(VecCoordId::position()); + const Data& dataInX = *FromModel->read(core::vec_id::read_access::position); const InVecCoord& xin = dataInX.getValue(); - const Data& dataOutX = *ToModel->read(VecCoordId::position()); + const Data& dataOutX = *ToModel->read(core::vec_id::read_access::position); const OutVecCoord& xout = dataOutX.getValue(); std::cout<<" x in = "<root->getTreeObject(ToModel); this->outDofs= ToModel; - const Data& dataInX = *FromModel->read(VecCoordId::position()); + const Data& dataInX = *FromModel->read(core::vec_id::read_access::position); const InVecCoord& xin = dataInX.getValue(); - const Data& dataOutX = *ToModel->read(VecCoordId::position()); + const Data& dataOutX = *ToModel->read(core::vec_id::read_access::position); const OutVecCoord& xout = dataOutX.getValue(); std::cout<<" x in = "< Date: Wed, 5 Feb 2025 09:42:45 +0100 Subject: [PATCH 2/2] Update BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp --- .../component/constraint/AdaptiveBeamSlidingConstraintTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp b/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp index 3a20b5b40..7a04b5154 100644 --- a/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp +++ b/BeamAdapter_test/component/constraint/AdaptiveBeamSlidingConstraintTest.cpp @@ -39,7 +39,7 @@ using sofa::simulation::SceneLoaderXML ; using sofa::simulation::graph::DAGSimulation; using sofa::simulation::Simulation ; using sofa::simulation::Node ; - using sofa::core::objectmodel::New ; +using sofa::core::objectmodel::New ; using sofa::core::objectmodel::BaseData ; using sofa::component::statecontainer::MechanicalObject ;