mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
0022651: Impossible to build OCC as static library due to using Standard_EXPORT instead of Standard_API
All library-specific macros for defining export / import properties of symbols on Windows (like Standard_API, __Draw_API, _math_API etc.) are eliminated. Common macro Standard_EXPORT is used in all places where it is necessary. New macro OCCT_STATIC_BUILD is defined for disabling Standard_EXPORT, to be used instead of HAVE_NO_DLL, though the latter is still supported as well (for compatibility). To allow building OCCT in static mode on Windows after these changes: - Files OSD_WNT_1.hxx and OSD_WNT_BREAK.hxx are removed; useful declarations are moved to OSD_WNT.hxx - In the class IVtkVTK_ShapeData, static fields ARRNAME_MESH_TYPES and ARRNAME_SUBSHAPE_IDS are converted to static inline functions - Global array ChoixRef defined in IntImp_ComputeTangence.cxx is converted to static function returning element of the array by index - Unused class Quantity_Convert is removed (it had static field accessed by inline method) - Struct Approx_Data defined in the same way in BRepApprox_Approx.hxx and GeomInt_WLApprox.hxx is made private member of these classes to avoid name clash - Some C++ files producing no object code are removed - In NCollection_EBTree.hxx and StdLPersistent_Collectio.hxx, definition of template virtual method is moved to class definition to avoid MSVC linker warnings on unused symbols
This commit is contained in:
@@ -68,18 +68,6 @@ private:
|
||||
Handle(TDF_Data) myDF;
|
||||
};
|
||||
|
||||
//=======================================================================
|
||||
//function : Read
|
||||
//purpose : Read persistent data from a file
|
||||
//=======================================================================
|
||||
template <class Base>
|
||||
void StdLPersistent_Collection::booleanArrayBase<Base>::Read
|
||||
(StdObjMgt_ReadData& theReadData)
|
||||
{
|
||||
Base::Read (theReadData);
|
||||
theReadData >> myLower >> myUpper;
|
||||
}
|
||||
|
||||
template <class Base>
|
||||
template <class ArrayHandle, class Converter>
|
||||
void StdLPersistent_Collection::booleanArrayBase<Base>::import
|
||||
|
@@ -47,7 +47,11 @@ class StdLPersistent_Collection
|
||||
{
|
||||
public:
|
||||
//! Read persistent data from a file.
|
||||
Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData);
|
||||
virtual void Read (StdObjMgt_ReadData& theReadData)
|
||||
{
|
||||
Base::Read (theReadData);
|
||||
theReadData >> myLower >> myUpper;
|
||||
}
|
||||
|
||||
protected:
|
||||
template <class ArrayHandle, class Converter>
|
||||
|
Reference in New Issue
Block a user