need to split C and namespaced functions for Windows (duplicate symbo…

…ls at linkage)
sofa-framework · Feb 9, 2024 · 77931f0 · 77931f0
1 parent c814c77
commit 77931f0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/init.cpp b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/init.cpp
@@ -34,6 +34,7 @@ extern "C" {
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleName();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleVersion();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleComponentList();
+    SOFA_EXPORT_DYNAMIC_LIBRARY void registerObjects(sofa::core::ObjectFactory* factory);
 }
 
 void initExternalModule()
@@ -58,6 +59,11 @@ const char* getModuleComponentList()
     return classes.c_str();
 }
 
+void registerObjects(sofa::core::ObjectFactory* factory)
+{
+    registerObjectsInFactory(factory);
+}
+
 void init()
 {
     static bool first = true;
@@ -68,7 +74,7 @@ void init()
     }
 }
 
-void registerObjects(sofa::core::ObjectFactory* factory)
+void registerObjectsInFactory(sofa::core::ObjectFactory* factory)
 {
     registerMappedObject(factory);
     registerMechanicalObject(factory);

diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/init.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/init.h
@@ -25,11 +25,12 @@
 
 namespace sofa::core
 {
-    struct ObjectFactory;
+    class ObjectFactory;
 }
 
 namespace sofa::component::statecontainer
 {
     SOFA_COMPONENT_STATECONTAINER_API void init();
-    extern "C" SOFA_COMPONENT_STATECONTAINER_API void registerObjects(sofa::core::ObjectFactory* factory);
+    SOFA_COMPONENT_STATECONTAINER_API void registerObjectsInFactory(sofa::core::ObjectFactory* factory);
+
 } // namespace sofa::component::statecontainer
diff --git a/Sofa/Component/src/sofa/component/init.cpp b/Sofa/Component/src/sofa/component/init.cpp
@@ -46,11 +46,12 @@
 
 namespace sofa::component
 {
-    
+
 extern "C" {
     SOFA_EXPORT_DYNAMIC_LIBRARY void initExternalModule();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleName();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleVersion();
+    SOFA_EXPORT_DYNAMIC_LIBRARY void registerObjects(sofa::core::ObjectFactory * factory);
 }
 
 void initExternalModule()
@@ -68,6 +69,11 @@ const char* getModuleVersion()
     return MODULE_VERSION;
 }
 
+void registerObjects(sofa::core::ObjectFactory* factory)
+{
+    registerObjectsInFactory(factory);
+}
+
 void init()
 {
     static bool first = true;
@@ -99,9 +105,9 @@ void init()
     }
 }
 
-void registerObjects(sofa::core::ObjectFactory* factory)
+void registerObjectsInFactory(sofa::core::ObjectFactory* factory)
 {
-    sofa::component::statecontainer::registerObjects(factory);
+    sofa::component::statecontainer::registerObjectsInFactory(factory);
 }
 
 } // namespace sofa::component
diff --git a/Sofa/Component/src/sofa/component/init.h b/Sofa/Component/src/sofa/component/init.h
@@ -26,11 +26,11 @@
 
 namespace sofa::core
 {
-    struct ObjectFactory;
+    class ObjectFactory;
 }
 
 namespace sofa::component
 {
 	SOFA_COMPONENT_API void init();
-    extern "C" SOFA_COMPONENT_API void registerObjects(sofa::core::ObjectFactory* factory);
+    SOFA_COMPONENT_API void registerObjectsInFactory(sofa::core::ObjectFactory* factory);
 } // namespace sofa::component