From e7bb24641736138ba023f1baddfe224d236a7792 Mon Sep 17 00:00:00 2001 From: Hadrien Courtecuisse Date: Thu, 30 Apr 2026 12:09:23 +0200 Subject: [PATCH 1/2] [Core] Fix: avoid extra ';' in macro causing massive warnings Move deprecated BaseObject alias inside SOFA_ABSTRACT_CLASS_DECL to avoid emitting an extra semicolon, which was triggering thousands of compiler warnings. No behavior change, only warning cleanup. --- Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h index 453e03e3044..e91f9cc8f50 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h @@ -234,6 +234,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass // Do not use this macro directly, use SOFA_ABSTRACT_CLASS instead #define SOFA_ABSTRACT_CLASS_DECL \ + using BaseObject SOFA_ATTRIBUTE_DEPRECATED("v26.06", "v29.06", "BaseObject has been renamed to BaseComponent") = sofa::core::objectmodel::BaseComponent; /*this alias allows the transition from BaseObject to BaseComponent.*/ \ typedef MyType* Ptr; \ friend class sofa::core::objectmodel::BaseClassNameHelper; \ static std::string GetDefaultTemplateName(){ return sofa::core::objectmodel::BaseClassNameHelper::DefaultTypeTemplateName::Get(); } \ @@ -248,7 +249,6 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass return ::sofa::core::objectmodel::BaseLink::InitLink \ (this, n, help); \ }\ - using BaseObject SOFA_ATTRIBUTE_DEPRECATED("v26.06", "v29.06", "BaseObject has been renamed to BaseComponent") = sofa::core::objectmodel::BaseComponent; // this alias allows the transition from BaseObject to BaseComponent. // Do not use this macro directly, use SOFA_CLASS instead #define SOFA_CLASS_DECL \ From 10d5c56165a20650b1af4514e5a5c3298221b2ef Mon Sep 17 00:00:00 2001 From: Themis Skamagkis <70031729+th-skam@users.noreply.github.com> Date: Thu, 7 May 2026 11:36:26 +0200 Subject: [PATCH 2/2] Update Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> --- Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h index e91f9cc8f50..07cf4a89232 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.h @@ -248,7 +248,7 @@ class SOFA_CORE_API DeprecatedBaseClass : public BaseClass { \ return ::sofa::core::objectmodel::BaseLink::InitLink \ (this, n, help); \ -}\ +} // Do not use this macro directly, use SOFA_CLASS instead #define SOFA_CLASS_DECL \