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

2
src/TopClass/FILES
View File

@@ -5,8 +5,6 @@ TopClass_Classifier3d.gxx
TopClass_Classifier3d.lxx
TopClass_FaceClassifier.gxx
TopClass_FaceClassifier.lxx
TopClass_Intersection3d.cxx
TopClass_Intersection3d.hxx
TopClass_SolidClassifier.gxx
TopClass_SolidExplorer.cxx
TopClass_SolidExplorer.hxx

15
src/TopClass/TopClass_Intersection3d.cxx
View File

@@ -1,15 +0,0 @@
// Created on: 1996-10-23
// Created by: Laurent BUCHARD
// 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.

99
src/TopClass/TopClass_Intersection3d.hxx
View File

@@ -1,99 +0,0 @@
// Created on: 1994-03-30
// Created by: Laurent BUCHARD
// Copyright (c) 1994-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.
#ifndef _TopClass_Intersection3d_HeaderFile
#define _TopClass_Intersection3d_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <TopAbs_State.hxx>
class gp_Lin;
class TopoDS_Face;
class IntCurveSurface_IntersectionPoint;
//! Template class for the intersection algorithm required
//! by the 3D classifications.
//!
//! (a intersection point near the origin of the line, ie.
//! at a distance less or equal than <tolerance>, will be
//! returned even if it has a negative parameter.)
class TopClass_Intersection3d
{
public:
DEFINE_STANDARD_ALLOC
//! Perform the intersection between the
//! segment L(0) ... L(Prm) and the Face <Face>.
//!
//! Only the point with the smallest parameter on the
//! line is returned.
//!
//! The Tolerance <Tol> is used to determine if the
//! first point of the segment is near the face. In
//! that case, the parameter of the intersection point
//! on the line can be a negative value (greater than -Tol).
Standard_EXPORT virtual void Perform (const gp_Lin& L, const Standard_Real Prm, const Standard_Real Tol, const TopoDS_Face& Face) = 0;
//! True is returned when the intersection have been computed.
Standard_EXPORT virtual Standard_Boolean IsDone() const = 0;
//! True is returned if a point has been found.
Standard_EXPORT virtual Standard_Boolean HasAPoint() const = 0;
//! Returns the Intersection Point.
Standard_EXPORT virtual const IntCurveSurface_IntersectionPoint& Point() const = 0;
//! Returns the state of the point on the face.
//! The values can be either TopAbs_IN
//! ( the point is in the face)
//! or TopAbs_ON
//! ( the point is on a boudary of the face).
Standard_EXPORT virtual TopAbs_State State() const = 0;
protected:
//! Empty constructor.
Standard_EXPORT TopClass_Intersection3d();
private:
};
#endif // _TopClass_Intersection3d_HeaderFile