OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-13 14:27:08 +03:00
Code Activity

0022651: Impossible to build OCC as static library due to using Standard_EXPORT instead of Standard_API

Browse Source 
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:
abv
2018-03-15 13:07:48 +03:00
parent 8662560e2c
commit 68df847802
86 changed files with 465 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/IntImp/IntImp_ComputeTangence.cxx
View File

@@ -14,6 +14,7 @@
#include <IntImp_ComputeTangence.hxx>
#include <IntImp_ConstIsoparametric.hxx>
#include <Standard_OutOfRange.hxx>
static const IntImp_ConstIsoparametric staticChoixRef [4] = {
IntImp_UIsoparametricOnCaro1,
@@ -22,7 +23,11 @@ IntImp_UIsoparametricOnCaro2,
IntImp_VIsoparametricOnCaro2,
};
Standard_EXPORT const IntImp_ConstIsoparametric *ChoixRef = staticChoixRef ;
IntImp_ConstIsoparametric ChoixRef (Standard_Integer theIndex)
{
Standard_OutOfRange_Raise_if (theIndex < 0 || theIndex > 3, "ChoixRef() in " __FILE__)
return staticChoixRef[theIndex];
}
//=======================================================================
//function : IntImp_ComputeTangence
@@ -131,7 +136,10 @@ Standard_Boolean IntImp_ComputeTangence(const gp_Vec DPuv[],
Standard_Boolean triOk = Standard_False;
Standard_Real t;
IntImp_ConstIsoparametric ti;
for ( i=0;i<=3;i++) TabIso[i] = ChoixRef[i];
for ( i=0;i<=3;i++)
{
TabIso[i] = staticChoixRef[i];
}
do {
triOk = Standard_True;
for(i=1;i<=3;i++) {
@@ -168,7 +176,10 @@ Standard_Boolean IntImp_ComputeTangence(const gp_Vec DPuv[],
NormDuv[II] = NormDuv[j];
NormDuv[j] = Tampon;
}
for (j=0; j<=3;j++) TabIso[j]=ChoixRef[Irang[j]];
for (j=0; j<=3;j++)
{
TabIso[j] = staticChoixRef[Irang[j]];
}
#endif
}
return tangent;