OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +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

42
src/BRepApprox/BRepApprox_Approx.hxx
View File

@@ -49,28 +49,30 @@ class BRepApprox_TheComputeLineBezierOfApprox;
class BRepApprox_MyGradientOfTheComputeLineBezierOfApprox;
class AppParCurves_MultiBSpCurve;
struct Approx_Data
{
Approx_Data() : myBezierApprox(Standard_True),
Xo(0.0), Yo(0.0), Zo(0.0),
U1o(0.0), V1o(0.0), U2o(0.0), V2o(0.0),
ApproxXYZ(Standard_True),
ApproxU1V1(Standard_True),
ApproxU2V2(Standard_True),
indicemin(0), indicemax(0),
myNbPntMax(30), parametrization(Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
class BRepApprox_Approx
{
private:
struct Approx_Data
{
Approx_Data () : myBezierApprox (Standard_True),
Xo (0.0), Yo (0.0), Zo (0.0),
U1o (0.0), V1o (0.0), U2o (0.0), V2o (0.0),
ApproxXYZ (Standard_True),
ApproxU1V1 (Standard_True),
ApproxU2V2 (Standard_True),
indicemin (0), indicemax (0),
myNbPntMax (30), parametrization (Approx_ChordLength)
{
}
Standard_Boolean myBezierApprox;
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
Standard_Integer indicemin, indicemax, myNbPntMax;
Approx_ParametrizationType parametrization;
};
public:
DEFINE_STANDARD_ALLOC

30
src/BRepApprox/BRepApprox_TheMultiLineToolOfApprox_0.cxx
View File

@@ -1,30 +0,0 @@
// Created on: 1995-06-06
// Created by: Jean Yves LEBEY
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <BRepApprox_TheMultiLineToolOfApprox.hxx>
#include <BRepApprox_TheMultiLineOfApprox.hxx>
#include <ApproxInt_SvSurfaces.hxx>
#define TheMultiLine BRepApprox_TheMultiLineOfApprox
#define TheMultiLine_hxx <BRepApprox_TheMultiLineOfApprox.hxx>
#define TheMultiMPoint ApproxInt_SvSurfaces
#define TheMultiMPoint_hxx <ApproxInt_SvSurfaces.hxx>
#define ApproxInt_MultiLineTool BRepApprox_TheMultiLineToolOfApprox
#define ApproxInt_MultiLineTool_hxx <BRepApprox_TheMultiLineToolOfApprox.hxx>
#include <ApproxInt_MultiLineTool.gxx>

1
src/BRepApprox/FILES
View File

@@ -46,7 +46,6 @@ BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
BRepApprox_TheMultiLineOfApprox.hxx
BRepApprox_TheMultiLineOfApprox_0.cxx
BRepApprox_TheMultiLineToolOfApprox.hxx
BRepApprox_TheMultiLineToolOfApprox_0.cxx
BRepApprox_ThePrmPrmSvSurfacesOfApprox.hxx
BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx
BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox.hxx