Skip to content

[Lifecycle] v26.06 : SOFA_HEADER_DEPRECATED #5905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredroy merged 16 commits into from
May 21, 2026
Merged

[Lifecycle] v26.06 : SOFA_HEADER_DEPRECATED #5905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0cfca9e
[Lifecycle] v26.06 : SOFA_HEADER_DEPRECATED
Jan 28, 2026
e92bbc1
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot Jan 29, 2026
201e7fe
Update applications/plugins/SofaTest/BroadPhase_test.h
hugtalbot Jan 29, 2026
de8f80f
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot Feb 3, 2026
7d2c597
replace SofaSimulationGraph/DAGNode and other DAGNode instances
Feb 3, 2026
6e803fa
Update applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsu…
bakpaul Feb 4, 2026
0907f2c
Merge branch 'master' into 202601_lifecycle_header_deprecated
fredroy Feb 13, 2026
c08c645
fix for newly introduced pipeline
fredroy Feb 13, 2026
0ac1f7d
Merge branch 'master' into 202601_lifecycle_header_deprecated
fredroy Feb 18, 2026
c0c6937
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot Feb 25, 2026
eba2c22
merge master 20260508
hugtalbot May 8, 2026
9aea58e
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot May 12, 2026
a9b82a1
missing fix in include path in InitTasks
hugtalbot May 15, 2026
6b84ced
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot May 16, 2026
0f1541e
Merge branch 'master' into 202601_lifecycle_header_deprecated
hugtalbot May 20, 2026
102367c
Merge branch 'master' into 202601_lifecycle_header_deprecated
bakpaul May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <sofa/core/collision/ContactManager.h>

#include <sofa/simulation/Node.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/ParallelForEach.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/ParallelForEach.h>

#include <sofa/helper/ScopedAdvancedTimer.h>
using sofa::helper::ScopedAdvancedTimer ;
Expand Down
4 changes: 2 additions & 2 deletions ...ion/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#include <sofa/core/collision/Intersection.inl>

#include <sofa/component/collision/geometry/LineModel.h>
#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/LineCollisionModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
#include <sofa/linearalgebra/EigenVector.h>

#include <tight_inclusion/ccd.hpp>
Expand Down
12 changes: 6 additions & 6 deletions ...ction/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@

#include <sofa/component/collision/detection/intersection/BaseProximityIntersection.h>

#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/LineModel.h>
#include <sofa/component/collision/geometry/PointModel.h>
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/component/collision/geometry/RayModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
#include <sofa/component/collision/geometry/LineCollisionModel.h>
#include <sofa/component/collision/geometry/PointCollisionModel.h>
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
#include <sofa/component/collision/geometry/RayCollisionModel.h>

namespace sofa::component::collision::detection::intersection
{
Expand Down
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/CubeCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/CylinderCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/CylinderCollisionModel.inl>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/LineCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/LineCollisionModel.inl>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/PointCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/PointCollisionModel.inl>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.inl")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.inl")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/RayModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/RayCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/RayCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/RayCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.inl>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.inl")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.inl")
2 changes: 1 addition & 1 deletion .../Component/Collision/Geometry/compat/sofa/component/collision/geometry/TetrahedronModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/TetrahedronCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TetrahedronCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TetrahedronCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.h")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
#include <sofa/component/collision/geometry/config.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.inl>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.inl")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.inl")
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ using sofa::component::collision::detection::intersection::MinProximityIntersect
using sofa::core::execparams::defaultInstance;
using sofa::core::objectmodel::New;

#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
using sofa::component::collision::geometry::Sphere;
using sofa::component::collision::geometry::SphereCollisionModel ;
using sofa::component::collision::geometry::RigidSphere;
Expand Down
4 changes: 2 additions & 2 deletions Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ using sofa::component::collision::detection::intersection::MeshMinProximityInter
#include <sofa/component/collision/detection/intersection/MeshNewProximityIntersection.inl>
using sofa::component::collision::detection::intersection::MeshNewProximityIntersection;

#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>

using sofa::core::execparams::defaultInstance;
using sofa::core::objectmodel::New;
#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
using sofa::component::collision::geometry::Sphere;
using sofa::component::collision::geometry::SphereCollisionModel;
using sofa::component::collision::geometry::RigidSphere;
Expand Down
2 changes: 1 addition & 1 deletion Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sofa/component/topology/container/constant/MeshTopology.h>
#include <sofa/component/statecontainer/MechanicalObject.h>

#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>

#include<sofa/simulation/Node.h>
using sofa::simulation::Node;
Expand Down
2 changes: 1 addition & 1 deletion ...Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <sofa/component/statecontainer/MechanicalObject.h>

#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>

#include<sofa/simulation/Node.h>
using sofa::simulation::Node;
Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Geometry/src/sofa/geometry/Pentahedron.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#include <sofa/geometry/config.h>
#include <sofa/geometry/Prism.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/geometry/Prism.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/geometry/Prism.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/CpuTask.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/CpuTask.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/CpuTask.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTaskStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/CpuTaskStatus.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/CpuTaskStatus.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/CpuTaskStatus.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/DefaultTaskScheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/DefaultTaskScheduler.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/DefaultTaskScheduler.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/DefaultTaskScheduler.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/InitTasks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/InitTasks.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/InitTasks.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/InitTasks.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerFactory.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerFactory.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/MainTaskSchedulerRegistry.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerRegistry.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerRegistry.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/ParallelForEach.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/ParallelForEach.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/ParallelForEach.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/ParallelForEach.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/Task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/Task.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/Task.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/Task.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskScheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/TaskScheduler.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskScheduler.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskScheduler.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/TaskSchedulerFactory.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerFactory.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerFactory.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/TaskSchedulerRegistry.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerRegistry.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerRegistry.h")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/compat/sofa/simulation/WorkerThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
******************************************************************************/
#pragma once
#include <sofa/simulation/task/WorkerThread.h>
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/WorkerThread.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/WorkerThread.h")
6 changes: 3 additions & 3 deletions Sofa/framework/Simulation/Core/test/ParallelForEach_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#include <gtest/gtest.h>
#include <sofa/simulation/DefaultTaskScheduler.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/ParallelForEach.h>
#include <sofa/simulation/task/DefaultTaskScheduler.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/ParallelForEach.h>
#include <sofa/testing/TestMessageHandler.h>

#include <numeric>
Expand Down
4 changes: 2 additions & 2 deletions Sofa/framework/Simulation/Core/test/ParallelSparseMatrixProduct_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* *
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/MainTaskSchedulerRegistry.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/MainTaskSchedulerRegistry.h>
#include <Sofa.LinearAlgebra.Testing/SparseMatrixProduct_test.h>
#include <sofa/simulation/ParallelSparseMatrixProduct.h>

Expand Down
4 changes: 2 additions & 2 deletions Sofa/framework/Simulation/Core/test/TaskSchedulerFactory_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#include <gtest/gtest.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/DefaultTaskScheduler.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/DefaultTaskScheduler.h>

namespace sofa
{
Expand Down
4 changes: 2 additions & 2 deletions Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
******************************************************************************/
#include "TaskSchedulerTestTasks.h"

#include <sofa/simulation/TaskScheduler.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/TaskScheduler.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>

using sofa::simulation::Task;

Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#include <sofa/simulation/CpuTask.h>
#include <sofa/simulation/task/CpuTask.h>

namespace sofa
{
Expand Down
6 changes: 3 additions & 3 deletions Sofa/framework/Simulation/Core/test/TaskSchedulerTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
******************************************************************************/
#include "TaskSchedulerTestTasks.h"

#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/CpuTask.h>
#include <sofa/simulation/DefaultTaskScheduler.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/CpuTask.h>
#include <sofa/simulation/task/DefaultTaskScheduler.h>
#include <sofa/testing/BaseTest.h>

namespace sofa
Expand Down
10 changes: 2 additions & 8 deletions Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,5 @@
#include <sofa/simulation/graph/config.h>
#include <sofa/simulation/Node.h>

#ifndef SOFA_BUILD_SOFA_SIMULATION_GRAPH
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "'sofa/simulation/Node.h' instead of 'sofa/simulation/graph/DAGNode.h' and replace uses of DAGNode with Node")
#endif

namespace sofa::simulation::graph
{
using DAGNode = sofa::simulation::Node;
} // namespace sofa::simulation::graph
//header moved in the plugin SofaValidation
SOFA_HEADER_DISABLED("v25.12", "v26.06", "'sofa/simulation/Node.h' instead of 'sofa/simulation/Node.h' and replace uses of DAGNode with Node")
2 changes: 1 addition & 1 deletion Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sofa/simulation/graph/DAGSimulation.h>

#include <sofa/simulation/common/xml/BaseElement.h>
#include <sofa/simulation/graph/DAGNode.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/init.h>

#include <sofa/core/ObjectFactory.h>
Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Topology/src/sofa/topology/Pentahedron.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#include <sofa/topology/config.h>
#include <sofa/topology/Prism.h>

SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/topology/Prism.h")
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/topology/Prism.h")
2 changes: 1 addition & 1 deletion .../plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <sofa/core/collision/BroadPhaseDetection.h>
#include <sofa/core/collision/NarrowPhaseDetection.h>
#include <sofa/core/CollisionElement.h>
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
#include <sofa/type/Vec.h>

#include "BulletCollisionModel.h"
Expand Down
8 changes: 4 additions & 4 deletions .../plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#include <sofa/component/statecontainer/MechanicalObject.h>
#include <sofa/simulation/Node.h>
#include <sofa/component/collision/response/mapper/BaseContactMapper.h>
#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
#include <sofa/component/collision/geometry/TetrahedronModel.h>
#include <sofa/component/collision/geometry/LineModel.h>
#include <sofa/component/collision/geometry/PointModel.h>
#include <sofa/component/collision/geometry/LineCollisionModel.h>
#include <sofa/component/collision/geometry/PointCollisionModel.h>
#include <sofa/component/collision/geometry/CylinderModel.h>
#include <sofa/core/VecId.h>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion ...cations/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BULLET_SPHERE_MODEL
#define BULLET_SPHERE_MODEL

#include <sofa/component/collision/geometry/SphereModel.h>
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
#include "BulletCollisionModel.h"
#include <sofa/simulation/CollisionBeginEvent.h>
#include <BulletCollisionDetection/config.h>
Expand Down
2 changes: 1 addition & 1 deletion ...tions/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BULLET_TRIANGLE_MODEL
#define BULLET_TRIANGLE_MODEL

#include <sofa/component/collision/geometry/TriangleModel.h>
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
#include "BulletCollisionModel.h"
#include <sofa/simulation/CollisionBeginEvent.h>
#include <BulletCollisionDetection/config.h>
Expand Down
Loading
Loading