Skip to content

Commit 328a525

Browse files
hugtalbothugtalbot
andauthored
[all] Clean uncovered lifecycle codes (sofa-framework#5898)
* Disable RegisterObject as it should have been * Remove data J, m_constraintMatrix to be used instead * Postpone removal to give epernod time to work on it * Fix error on lifecycle disabling version in Prism * Fix version also in Prism in topology * restore RegisterObject as deprecated since SofaCUDA has only been merged --------- Co-authored-by: hugtalbot <hugo.talbot@inria.fr>
1 parent 4e20409 commit 328a525

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint
113113
void getBlockDiagonalCompliance(linearalgebra::BaseMatrix* W, int begin, int end) override;
114114

115115
protected:
116-
//SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Further to #5017 use m_constraintMatrix instead")
117-
DeprecatedAndRemoved J; ///< use m_constraintMatrix instead
118-
119116
linearalgebra::SparseMatrix<Real> m_constraintJacobian;
120117

121118
/**

Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,13 +394,13 @@ class TriangleSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms<DataTypes
394394

395395
// compute barycentric coefficients
396396
// {
397-
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
397+
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
398398
sofa::type::vector< SReal > computeTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const;
399399

400-
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true")
400+
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true")
401401
sofa::type::vector< SReal > computeRestTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const;
402402

403-
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
403+
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
404404
sofa::type::vector< SReal > compute3PointsBarycoefs(const sofa::type::Vec<3, Real>& p,
405405
PointID ind_p1,
406406
PointID ind_p2,

Sofa/framework/Core/src/sofa/core/config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT()
6767
#else
6868
#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() \
69-
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.")
69+
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.")
7070
#endif
7171

7272
#ifdef SOFA_BUILD_SOFA_CORE

Sofa/framework/Geometry/src/sofa/geometry/Prism.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ struct Prism
3535
Prism() = delete;
3636
};
3737

38-
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism;
38+
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism;
3939

4040
} // namespace sofa::geometry

Sofa/framework/Topology/src/sofa/topology/Prism.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace sofa::topology
2929
{
3030
using Prism = sofa::topology::Element<sofa::geometry::Prism>;
3131

32-
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism;
32+
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism;
3333

3434
static constexpr Prism InvalidPrism;
3535
}

0 commit comments

Comments
 (0)