Skip to content

Commit 9929a2f

Browse files
hugtalbotfredroy
authored andcommitted
Complete removal of SOFA_ATTRIBUTE_DISABLED with Node
1 parent 7c3bf66 commit 9929a2f

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,15 +1006,6 @@ void Node::printComponents()
10061006
msg_info() << sstream.str();
10071007
}
10081008

1009-
Node::SPtr Node::create( const std::string& name )
1010-
{
1011-
if (Simulation* simulation = getSimulation())
1012-
{
1013-
return simulation->createNewNode(name);
1014-
}
1015-
return nullptr;
1016-
}
1017-
10181009
void Node::setSleeping(bool val)
10191010
{
10201011
if (val != d_isSleeping.getValue())

Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,6 @@ class SOFA_SIMULATION_CORE_API Node : public sofa::core::objectmodel::BaseNode,
517517
template <class RealObject>
518518
static Node::SPtr create(RealObject*, sofa::core::objectmodel::BaseObjectDescription* arg);
519519

520-
SOFA_ATTRIBUTE_DISABLED_NODECREATENODE()
521-
static Node::SPtr create( const std::string& name );
522-
523520
/// return the smallest common parent between this and node2 (returns nullptr if separated sub-graphes)
524521
virtual Node* findCommonParent( simulation::Node* node2 ) = 0;
525522

Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@
3232
# define SOFA_SIMULATION_CORE_API SOFA_IMPORT_DYNAMIC_LIBRARY
3333
#endif
3434

35-
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
36-
#define SOFA_ATTRIBUTE_DISABLED_NODECREATENODE()
37-
#else
38-
#define SOFA_ATTRIBUTE_DISABLED_NODECREATENODE() \
39-
SOFA_ATTRIBUTE_DISABLED( \
40-
"v23.12", "v24.06", "")
41-
#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
42-
4335

4436

4537
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
@@ -58,19 +50,9 @@
5850

5951
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
6052
#define SOFA_HEADER_DISABLED_LOCALSTORAGE()
61-
#define SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE()
6253
#else
6354
#define SOFA_HEADER_DISABLED_LOCALSTORAGE() \
6455
SOFA_HEADER_DISABLED_NOT_REPLACED("v23.12", "v24.06")
65-
#define SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() \
66-
SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "LocalStorage feature was seemingly not used so it has been removed.")
67-
#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
68-
69-
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE
70-
#define SOFA_ATTRIBUTE_DISABLED_NODEDATA()
71-
#else
72-
#define SOFA_ATTRIBUTE_DISABLED_NODEDATA() \
73-
SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "rootdata/nodedata feature was never really used so it has been removed. All the related functions/members/variables won't do anything.")
7456
#endif // SOFA_BUILD_SOFA_SIMULATION_CORE
7557

7658
#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE

0 commit comments

Comments
 (0)