Remove symbol in LCPcal and ColourPickingVisitor for Win compilation

sofa-framework · Feb 28, 2024 · 62b2daf · 62b2daf
1 parent 7b9718a
commit 62b2daf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h b/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h
@@ -37,12 +37,12 @@ void SOFA_GUI_COMMON_API decodePosition( sofa::gui::component::performer::BodyPi
 
 // compat
 SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY()
-void SOFA_GUI_COMMON_API decodeCollisionElement( const sofa::type::Vec4f& colour, sofa::gui::component::performer::BodyPicked& body ) = delete;
+void decodeCollisionElement( const sofa::type::Vec4f& colour, sofa::gui::component::performer::BodyPicked& body ) = delete;
 SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY()
-void SOFA_GUI_COMMON_API decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::TriangleCollisionModel<sofa::defaulttype::Vec3Types>* model,
+void decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::TriangleCollisionModel<sofa::defaulttype::Vec3Types>* model,
         const unsigned int index) = delete;
 SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY()
-void SOFA_GUI_COMMON_API decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::SphereCollisionModel<sofa::defaulttype::Vec3Types>* model,
+void decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::SphereCollisionModel<sofa::defaulttype::Vec3Types>* model,
         const unsigned int index) = delete;
 
 

diff --git a/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h b/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h
@@ -96,13 +96,12 @@ inline SOFA_HELPER_API SReal absError(SReal f1x, SReal f1y, SReal f1z, SReal f2x
 {return sqrt ((f2x-f1x)*(f2x-f1x) + (f2y-f1y)*(f2y-f1y) + (f2z-f1z)*(f2z-f1z));}
 
 
-SOFA_HELPER_API SOFA_LCPCALC_RESOUDRELCP_DISABLED() int resoudreLCP(int, SReal *, SReal **, SReal *) = delete;
-SOFA_HELPER_API int solveLCP(int, SReal *, SReal **, SReal *);
-
+SOFA_LCPCALC_RESOUDRELCP_DISABLED() int resoudreLCP(int, SReal *, SReal **, SReal *) = delete;
+SOFA_LCPCALC_AFFICHESYST_DISABLED() void afficheSyst(SReal *q,SReal **M, int *base, SReal **mat, int dim) = delete;
+SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, int dim) = delete;
+SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, SReal *f, int dim) = delete;
 
-SOFA_HELPER_API SOFA_LCPCALC_AFFICHESYST_DISABLED() void afficheSyst(SReal *q,SReal **M, int *base, SReal **mat, int dim) = delete;
-SOFA_HELPER_API SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, int dim) = delete;
-SOFA_HELPER_API SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, SReal *f, int dim) = delete;
+SOFA_HELPER_API int solveLCP(int, SReal *, SReal **, SReal *);
 SOFA_HELPER_API void printSyst(SReal* q, SReal** M, int* base, SReal** mat, int dim);
 SOFA_HELPER_API void printLCP(SReal* q, SReal** M, int dim);
 SOFA_HELPER_API void printLCP(SReal* q, SReal** M, SReal* f, int dim);