Skip to content
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

[all] Compatibility with C++20 #5056

Merged
merged 7 commits into from
Nov 14, 2024
Merged

[all] Compatibility with C++20 #5056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a01f66
Fix std::memory_order according to changes in C++20
alxbilger Oct 22, 2024
967f720
declare BilateralLagrangianConstraint::bwdInit specialization
alxbilger Oct 23, 2024
6463f2b
simplify real type
alxbilger Oct 23, 2024
19e784c
remove duplicated using
alxbilger Oct 23, 2024
05900dc
scope initData to direct parent
alxbilger Oct 23, 2024
fa1c835
remove forward declaration
alxbilger Oct 24, 2024
bd8e483
Missing aliases cause compilation fail
alxbilger Oct 24, 2024
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
3 changes: 3 additions & 0 deletions ...gian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ class BilateralLagrangianConstraint : public PairInteractionConstraint<DataTypes
Index indexOfElemConstraint(const SubsetIndices& cIndices, Index Id);
};

template<> SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_MODEL_API
void BilateralLagrangianConstraint<Rigid3Types>::bwdInit();


#if !defined(SOFA_COMPONENT_CONSTRAINTSET_BILATERALLAGRANGIANCONSTRAINT_CPP)
extern template class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_MODEL_API BilateralLagrangianConstraint< Vec3Types >;
Expand Down
2 changes: 1 addition & 1 deletion ...agrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void ConstraintProblem::clear(int nbConstraints)
f.resize(nbConstraints);

static std::atomic<unsigned int> counter = 0;
problemId = counter.fetch_add(1, std::memory_order::memory_order_relaxed);
problemId = counter.fetch_add(1, std::memory_order_relaxed);
}

unsigned int ConstraintProblem::getProblemId()
Expand Down
2 changes: 1 addition & 1 deletion Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/Vertex2Frame.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace sofa::component::engine::transform
{

template <class DataTypes>
const typename Vertex2Frame<DataTypes>::Real Vertex2Frame<DataTypes>::EPSILON = std::numeric_limits<Vertex2Frame<DataTypes>::Real>::epsilon();
const Real_t<DataTypes> Vertex2Frame<DataTypes>::EPSILON = std::numeric_limits<Real_t<DataTypes>>::epsilon();

template <class DataTypes>
Vertex2Frame<DataTypes>::Vertex2Frame():
Expand Down
1 change: 0 additions & 1 deletion ...stem/src/sofa/component/linearsystem/matrixaccumulators/BaseAssemblingMatrixAccumulator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class BaseAssemblingMatrixAccumulator : public sofa::core::get_base_object_stron
SOFA_CLASS(SOFA_TEMPLATE(BaseAssemblingMatrixAccumulator, c), sofa::core::get_base_object_strong_type<c>);
using ComponentType = typename Inherit1::ComponentType;

using Inherit1::initData;
using Inherit1::add;

virtual void setMatrixSize(const sofa::type::Vec2u&);
Expand Down
4 changes: 4 additions & 0 deletions Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class IdentityMapping : public LinearMapping<TIn, TOut>
typedef typename In::Coord InCoord;
typedef typename In::Deriv InDeriv;
typedef typename In::MatrixDeriv InMatrixDeriv;
typedef Data<InVecCoord> InDataVecCoord;
typedef Data<InVecDeriv> InDataVecDeriv;

typedef typename Out::VecCoord VecCoord;
typedef typename Out::VecDeriv VecDeriv;
Expand All @@ -61,6 +63,8 @@ class IdentityMapping : public LinearMapping<TIn, TOut>
typedef typename OutDataTypes::Real OutReal;
typedef typename OutDataTypes::VecCoord OutVecCoord;
typedef typename OutDataTypes::VecDeriv OutVecDeriv;
typedef Data<OutVecCoord> OutDataVecCoord;
typedef Data<OutVecDeriv> OutDataVecDeriv;

enum
{
Expand Down
4 changes: 4 additions & 0 deletions Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,17 @@ class RigidMapping : public core::Mapping<TIn, TOut>, public NonLinearMappingDat
typedef typename Out::VecCoord OutVecCoord;
typedef typename Out::VecDeriv OutVecDeriv;
typedef typename Out::MatrixDeriv OutMatrixDeriv;
typedef Data<OutVecCoord> OutDataVecCoord;
typedef Data<OutVecDeriv> OutDataVecDeriv;

typedef typename In::Real InReal;
typedef typename In::Coord InCoord;
typedef typename In::Deriv InDeriv;
typedef typename In::VecCoord InVecCoord;
typedef typename In::VecDeriv InVecDeriv;
typedef typename In::MatrixDeriv InMatrixDeriv;
typedef Data<InVecCoord> InDataVecCoord;
typedef Data<InVecDeriv> InDataVecDeriv;

enum
{
Expand Down
13 changes: 12 additions & 1 deletion Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef T MyType; \
typedef ::sofa::core::objectmodel::TClass< T, Parent > MyClass; \
typedef Parent Inherit1; \
using Parent::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 1 base class
#define SOFA_ABSTRACT_CLASS(T,Parent) \
typedef T MyType; \
typedef ::sofa::core::objectmodel::TClass< T, Parent > MyClass; \
typedef Parent Inherit1; \
using Parent::initData; \
SOFA_ABSTRACT_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 2 base classes
Expand All @@ -126,6 +128,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef ::sofa::core::objectmodel::TClass< T, ::sofa::core::objectmodel::Parents<Parent1, Parent2> > MyClass; \
typedef Parent1 Inherit1; \
typedef Parent2 Inherit2; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 2 base classes
Expand All @@ -134,6 +137,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef ::sofa::core::objectmodel::TClass< T, ::sofa::core::objectmodel::Parents<Parent1, Parent2> > MyClass; \
typedef Parent1 Inherit1; \
typedef Parent2 Inherit2; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_ABSTRACT_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 3 base classes
Expand All @@ -143,6 +147,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent1 Inherit1; \
typedef Parent2 Inherit2; \
typedef Parent3 Inherit3; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 3 base classes
Expand All @@ -152,6 +157,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent1 Inherit1; \
typedef Parent2 Inherit2; \
typedef Parent3 Inherit3; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_ABSTRACT_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 4 base classes
Expand All @@ -162,6 +168,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent2 Inherit2; \
typedef Parent3 Inherit3; \
typedef Parent4 Inherit4; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 4 base classes
Expand All @@ -172,6 +179,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent2 Inherit2; \
typedef Parent3 Inherit3; \
typedef Parent4 Inherit4; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_ABSTRACT_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 5 base classes
Expand All @@ -183,6 +191,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent3 Inherit3; \
typedef Parent4 Inherit4; \
typedef Parent5 Inherit5; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 5 base classes
Expand All @@ -194,6 +203,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent3 Inherit3; \
typedef Parent4 Inherit4; \
typedef Parent5 Inherit5; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_ABSTRACT_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 5 base classes
Expand All @@ -206,6 +216,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent4 Inherit4; \
typedef Parent5 Inherit5; \
typedef Parent6 Inherit6; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_CLASS_DECL

// This macro should now be used at the beginning of all declarations of classes with 5 base classes
Expand All @@ -218,6 +229,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
typedef Parent4 Inherit4; \
typedef Parent5 Inherit5; \
typedef Parent6 Inherit6; \
using ::sofa::core::objectmodel::Base::initData; \
SOFA_ABSTRACT_CLASS_DECL

// Do not use this macro directly, use SOFA_ABSTRACT_CLASS instead
Expand All @@ -230,7 +242,6 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass
virtual const ::sofa::core::objectmodel::BaseClass* getClass() const override \
{ return GetClass(); } \
static const char* HeaderFileLocation() { return __FILE__; } \
using ::sofa::core::objectmodel::Base::initData; \
::sofa::core::objectmodel::BaseLink::InitLink<MyType> \
initLink(const char* name, const char* help) \
{ \
Expand Down
4 changes: 2 additions & 2 deletions Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultTaskScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@ void DefaultTaskScheduler::WaitForWorkersToBeReady()

void DefaultTaskScheduler::setMainTaskStatus(const Task::Status* mainTaskStatus)
{
m_mainTaskStatus.store(mainTaskStatus, std::memory_order::memory_order_relaxed);
m_mainTaskStatus.store(mainTaskStatus, std::memory_order_relaxed);
}

bool DefaultTaskScheduler::testMainTaskStatus(const Task::Status* status)
{
return m_mainTaskStatus.load(std::memory_order::memory_order_relaxed) == status;
return m_mainTaskStatus.load(std::memory_order_relaxed) == status;
}

} // namespace sofa::simulation
7 changes: 1 addition & 6 deletions Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultVisualManagerLoop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@
#include <sofa/simulation/fwd.h>
#include <sofa/core/visual/VisualLoop.h>
#include <sofa/core/objectmodel/BaseObject.h>
#include <sofa/simulation/Node.h>

namespace sofa::core::objectmodel
{
// Forward declaration for extern template declaration. This design permit to
// not #include<sofa::simulation::Node>
extern template class SingleLink< sofa::simulation::DefaultVisualManagerLoop, simulation::Node, BaseLink::FLAG_STOREPATH>;
}

namespace sofa::simulation
{
Expand Down
Loading