From e789b2b29d007d22a419dbc12714e08cf643c8a4 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 28 Jan 2026 11:12:46 +0100 Subject: [PATCH 1/6] Disable RegisterObject as it should have been --- Sofa/framework/Core/src/sofa/core/ObjectFactory.h | 2 +- Sofa/framework/Core/src/sofa/core/config.h.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h index 165e0ac0095..c492e9e72bb 100644 --- a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h +++ b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h @@ -397,7 +397,7 @@ class SOFA_CORE_API ObjectRegistrationData // Legacy structure, to keep compatibility with olden code // using the singleton to get the instance of ObjectFactory -class SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() SOFA_CORE_API RegisterObject +class SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() SOFA_CORE_API RegisterObject { private: ObjectRegistrationData m_objectRegistrationdata; diff --git a/Sofa/framework/Core/src/sofa/core/config.h.in b/Sofa/framework/Core/src/sofa/core/config.h.in index bf8192e77b6..8ada2b1200e 100644 --- a/Sofa/framework/Core/src/sofa/core/config.h.in +++ b/Sofa/framework/Core/src/sofa/core/config.h.in @@ -63,10 +63,10 @@ #endif #ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() +#define SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() #else -#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.") +#define SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() \ + SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.") #endif #ifdef SOFA_BUILD_SOFA_CORE From 67a6511d03185a1cfa076ce2f3d5fd19a5ee6f36 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 28 Jan 2026 11:13:38 +0100 Subject: [PATCH 2/6] Remove data J, m_constraintMatrix to be used instead --- .../lagrangian/correction/LinearSolverConstraintCorrection.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h index 018dd80649b..d55011ccc95 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h @@ -113,9 +113,6 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint void getBlockDiagonalCompliance(linearalgebra::BaseMatrix* W, int begin, int end) override; protected: - //SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Further to #5017 use m_constraintMatrix instead") - DeprecatedAndRemoved J; ///< use m_constraintMatrix instead - linearalgebra::SparseMatrix m_constraintJacobian; /** From 7cb3738fe14d35a0236adc6ba45a76f7efcde27b Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 28 Jan 2026 14:21:48 +0100 Subject: [PATCH 3/6] Postpone removal to give epernod time to work on it --- .../container/dynamic/TriangleSetGeometryAlgorithms.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h index b1d5a37edb5..e0cbc8cfaef 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h @@ -394,13 +394,13 @@ class TriangleSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms computeTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const; - SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true") + SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true") sofa::type::vector< SReal > computeRestTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const; - SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates") + SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates") sofa::type::vector< SReal > compute3PointsBarycoefs(const sofa::type::Vec<3, Real>& p, PointID ind_p1, PointID ind_p2, From f0ef3259a0d497d9fb6c5f294abb0a293b397622 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 28 Jan 2026 14:25:34 +0100 Subject: [PATCH 4/6] Fix error on lifecycle disabling version in Prism --- Sofa/framework/Geometry/src/sofa/geometry/Prism.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sofa/framework/Geometry/src/sofa/geometry/Prism.h b/Sofa/framework/Geometry/src/sofa/geometry/Prism.h index ea2ccb23609..0bdcdc48431 100644 --- a/Sofa/framework/Geometry/src/sofa/geometry/Prism.h +++ b/Sofa/framework/Geometry/src/sofa/geometry/Prism.h @@ -35,6 +35,6 @@ struct Prism Prism() = delete; }; -using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism; +using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism; } // namespace sofa::geometry From 9001bc87ff326ab222d9b4eadaaf9fceeddf9778 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Wed, 28 Jan 2026 14:46:35 +0100 Subject: [PATCH 5/6] Fix version also in Prism in topology --- Sofa/framework/Topology/src/sofa/topology/Prism.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sofa/framework/Topology/src/sofa/topology/Prism.h b/Sofa/framework/Topology/src/sofa/topology/Prism.h index c9fe0b48f16..97fedb540f1 100644 --- a/Sofa/framework/Topology/src/sofa/topology/Prism.h +++ b/Sofa/framework/Topology/src/sofa/topology/Prism.h @@ -29,7 +29,7 @@ namespace sofa::topology { using Prism = sofa::topology::Element; - using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism; + using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism; static constexpr Prism InvalidPrism; } From e41bcd3c3e86c18adaba45dd8c5e405be6633d15 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Thu, 29 Jan 2026 07:51:39 +0100 Subject: [PATCH 6/6] restore RegisterObject as deprecated since SofaCUDA has only been merged --- Sofa/framework/Core/src/sofa/core/ObjectFactory.h | 2 +- Sofa/framework/Core/src/sofa/core/config.h.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h index c492e9e72bb..165e0ac0095 100644 --- a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h +++ b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h @@ -397,7 +397,7 @@ class SOFA_CORE_API ObjectRegistrationData // Legacy structure, to keep compatibility with olden code // using the singleton to get the instance of ObjectFactory -class SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() SOFA_CORE_API RegisterObject +class SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() SOFA_CORE_API RegisterObject { private: ObjectRegistrationData m_objectRegistrationdata; diff --git a/Sofa/framework/Core/src/sofa/core/config.h.in b/Sofa/framework/Core/src/sofa/core/config.h.in index 8ada2b1200e..3ddb668a2a2 100644 --- a/Sofa/framework/Core/src/sofa/core/config.h.in +++ b/Sofa/framework/Core/src/sofa/core/config.h.in @@ -63,10 +63,10 @@ #endif #ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() +#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() #else -#define SOFA_ATTRIBUTE_DISABLED__REGISTEROBJECT() \ - SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.") +#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() \ + SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v26.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.") #endif #ifdef SOFA_BUILD_SOFA_CORE