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/MAT2d/FILES
View File

@@ -30,7 +30,5 @@ MAT2d_MiniPath.hxx
MAT2d_SequenceOfConnexion.hxx
MAT2d_SequenceOfSequenceOfCurve.hxx
MAT2d_SequenceOfSequenceOfGeometry.hxx
MAT2d_SketchExplorer.cxx
MAT2d_SketchExplorer.hxx
MAT2d_Tool2d.cxx
MAT2d_Tool2d.hxx

15
src/MAT2d/MAT2d_SketchExplorer.cxx
View File

@@ -1,15 +0,0 @@
// Created on: 1993-07-13
// Created by: Yves FRICAUD
// Copyright (c) 1993-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.

80
src/MAT2d/MAT2d_SketchExplorer.hxx
View File

@@ -1,80 +0,0 @@
// Created on: 1993-07-12
// Created by: Yves FRICAUD
// Copyright (c) 1993-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 _MAT2d_SketchExplorer_HeaderFile
#define _MAT2d_SketchExplorer_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Boolean.hxx>
class Geom2d_Curve;
//! SketchExplorer is an iterator on a sketch. A
//! sketch is a set of contours, each contour is a set
//! of curves from Geom2d.
//! It's use by BisectingLocus.
class MAT2d_SketchExplorer
{
public:
DEFINE_STANDARD_ALLOC
//! Returns the number of contours in the figure.
Standard_EXPORT Standard_Integer NumberOfContours() const;
//! Initializes the curves explorer on the contour
//! of range <ContourIndex>.
Standard_EXPORT void Init (const Standard_Integer ContourIndex);
//! Returns False if there is no more curves on the
//! current contour.
Standard_EXPORT Standard_Boolean More() const;
//! Moves to the next curve of the current contour.
Standard_EXPORT void Next();
//! Returns the current curve on the current contour.
Standard_EXPORT Handle(Geom2d_Curve) Value() const;
protected:
private:
};
#endif // _MAT2d_SketchExplorer_HeaderFile