From c0563cf36d6ffe1723a2a9d694dd14383ea9ce98 Mon Sep 17 00:00:00 2001 From: nds Date: Fri, 19 Oct 2018 07:35:15 +0300 Subject: [PATCH] Add Standard_EXPORT definition --- src/Select3D/Select3D_SensitiveCircle.hxx | 2 +- src/Select3D/Select3D_SensitiveGroup.hxx | 18 +++++----- src/Select3D/Select3D_SensitivePoly.hxx | 8 ++--- .../Select3D_SensitiveTriangulation.hxx | 16 ++++----- src/ViewerTest/ViewerTest_CmdParser.hxx | 34 +++++++++---------- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Select3D/Select3D_SensitiveCircle.hxx b/src/Select3D/Select3D_SensitiveCircle.hxx index 12ca661577..0d3445463b 100644 --- a/src/Select3D/Select3D_SensitiveCircle.hxx +++ b/src/Select3D/Select3D_SensitiveCircle.hxx @@ -93,7 +93,7 @@ protected: //! Calculates distance from the 3d projection of used-picked screen point //! to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; private: diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx index 58e64a383c..27540f4cb4 100644 --- a/src/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Select3D/Select3D_SensitiveGroup.hxx @@ -143,21 +143,21 @@ public: //! Returns the length of vector of sensitive entities Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE; -private: +protected: //! Checks whether the entity with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, - SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; private: diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx index 8f600c8405..2658bc98a4 100644 --- a/src/Select3D/Select3D_SensitivePoly.hxx +++ b/src/Select3D/Select3D_SensitivePoly.hxx @@ -92,22 +92,22 @@ public: Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1, const Standard_Integer theIdx2) Standard_OVERRIDE; -private: +protected: //! Checks whether the segment with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, SelectBasics_SelectingVolumeManager& theMgr, Standard_Integer theElemIdx, Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, Standard_Integer theElemIdx, Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point //! to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; protected: diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx index b7228f0e21..2317c240be 100644 --- a/src/Select3D/Select3D_SensitiveTriangulation.hxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx @@ -102,18 +102,18 @@ protected: private: //! Checks whether the element with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, - SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; private: diff --git a/src/ViewerTest/ViewerTest_CmdParser.hxx b/src/ViewerTest/ViewerTest_CmdParser.hxx index 22487ca412..03e45bc521 100644 --- a/src/ViewerTest/ViewerTest_CmdParser.hxx +++ b/src/ViewerTest/ViewerTest_CmdParser.hxx @@ -31,7 +31,7 @@ class ViewerTest_CmdParser public: //! Initializes default option. - ViewerTest_CmdParser(); + Standard_EXPORT ViewerTest_CmdParser(); //! Sets description for command. void AddDescription (const std::string& theDescription) @@ -40,47 +40,47 @@ public: } //! Adds option to available option list. Several names may be provided if separated with '|'. - void AddOption (const std::string& theOptionNames, const std::string& theOptionDescription = ""); + Standard_EXPORT void AddOption (const std::string& theOptionNames, const std::string& theOptionDescription = ""); //! Prints help message based on provided command and options descriptions. - void Help(); + Standard_EXPORT void Help(); //! Parses argument list; assignes local arguments to each option. - void Parse (Standard_Integer theArgsNb, - const char** theArgVec); + Standard_EXPORT void Parse (Standard_Integer theArgsNb, + const char** theArgVec); //! Checks if option was set with given minimal argument number. //! Prints error message if isFatal flag was set. - Standard_Boolean HasOption (const std::string& theOptionName, - Standard_Integer theMandatoryArgsNb = 0, - Standard_Boolean isFatal = Standard_False); + Standard_EXPORT Standard_Boolean HasOption (const std::string& theOptionName, + Standard_Integer theMandatoryArgsNb = 0, + Standard_Boolean isFatal = Standard_False); //! Accesses local argument of option 'theOptionName' with index 'theArgumentIndex'. - std::string Arg (const std::string& theOptionName, Standard_Integer theArgumentIndex); + Standard_EXPORT std::string Arg (const std::string& theOptionName, Standard_Integer theArgumentIndex); // Interprets arguments of option 'theOptionName' as float vector starting with index 'theArgumentIndex'. - Graphic3d_Vec3 ArgVec3f (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Graphic3d_Vec3 ArgVec3f (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as double vector starting with index 'theArgumentIndex'. - Graphic3d_Vec3d ArgVec3d (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Graphic3d_Vec3d ArgVec3d (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as gp vector starting with index 'theArgumentIndex'. - gp_Vec ArgVec (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT gp_Vec ArgVec (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as gp vector starting with index 'theArgumentIndex'. - gp_Pnt ArgPnt (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT gp_Pnt ArgPnt (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as double at index 'theArgumentIndex'. - Standard_Real ArgDouble (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Standard_Real ArgDouble (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as float at index 'theArgumentIndex'. - Standard_ShortReal ArgFloat (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Standard_ShortReal ArgFloat (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as integer at index 'theArgumentIndex'. - Standard_Integer ArgInt (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Standard_Integer ArgInt (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); // Interprets arguments of option 'theOptionName' as boolean at index 'theArgumentIndex'. - Standard_Boolean ArgBool (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); + Standard_EXPORT Standard_Boolean ArgBool (const std::string& theOptionName, const Standard_Integer theArgumentIndex = 0); private: -- 2.39.5