OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031304: Configuration - TKACIS building failure due to duplicated symbol GeomFillFusInt()

Browse Source 
Added missing "static" to internal methods of GeomFill package.
This commit is contained in:
kgv 2020-01-17 12:12:11 +03:00 committed by bugmaster
parent 6558400123
commit e83d440f92
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GeomConvert/GeomConvert_1.cxx
View File

@ -76,8 +76,7 @@ typedef gp_Pnt Pnt;
//purpose :
//=======================================================================
Handle(Geom_BSplineSurface) BSplineSurfaceBuilder
(const Convert_ElementarySurfaceToBSplineSurface& Convert)
static Handle(Geom_BSplineSurface) BSplineSurfaceBuilder (const Convert_ElementarySurfaceToBSplineSurface& Convert)
{
Handle(Geom_BSplineSurface) TheSurface;
Standard_Integer UDegree = Convert.UDegree ();

4
src/GeomFill/GeomFill_BSplineCurves.cxx
View File

@ -48,7 +48,7 @@
// ----->-----
// CC1 = C1
//=======================================================================
Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1,
static Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1,
const Handle(Geom_BSplineCurve)& C2,
const Handle(Geom_BSplineCurve)& C3,
const Handle(Geom_BSplineCurve)& C4,
@ -103,7 +103,7 @@ Standard_Boolean Arrange(const Handle(Geom_BSplineCurve)& C1,
//purpose : Internal Use Only
//=======================================================================
Standard_Integer SetSameDistribution(Handle(Geom_BSplineCurve)& C1,
static Standard_Integer SetSameDistribution(Handle(Geom_BSplineCurve)& C1,
Handle(Geom_BSplineCurve)& C2 )
{
Standard_Integer nbp1 = C1->NbPoles();

4
src/GeomFill/GeomFill_BezierCurves.cxx
View File

@ -42,7 +42,7 @@
// the geometry of the curve.
// Only the length of the derivatives are changed.
//=======================================================================
void SetSameWeights(TColStd_Array1OfReal& W1,
static void SetSameWeights(TColStd_Array1OfReal& W1,
TColStd_Array1OfReal& W2,
TColStd_Array1OfReal& W3,
TColStd_Array1OfReal& W4 )
@ -98,7 +98,7 @@ void SetSameWeights(TColStd_Array1OfReal& W1,
// CC1 = C1
//=======================================================================
Standard_Boolean Arrange(const Handle(Geom_BezierCurve)& C1,
static Standard_Boolean Arrange(const Handle(Geom_BezierCurve)& C1,
const Handle(Geom_BezierCurve)& C2,
const Handle(Geom_BezierCurve)& C3,
const Handle(Geom_BezierCurve)& C4,

6
src/GeomFill/GeomFill_CircularBlendFunc.cxx
View File

@ -35,9 +35,9 @@ IMPLEMENT_STANDARD_RTTIEXT(GeomFill_CircularBlendFunc,Approx_SweepFunction)
static Standard_Integer NbSections = 0;
#endif
const Standard_Real TolAng = 1.e-6;
static const Standard_Real TolAng = 1.e-6;
GeomAbs_Shape GeomFillNextShape(const GeomAbs_Shape S)
static GeomAbs_Shape GeomFillNextShape(const GeomAbs_Shape S)
{
switch (S) {
case GeomAbs_C0 :
@ -53,7 +53,7 @@ GeomAbs_Shape GeomFillNextShape(const GeomAbs_Shape S)
}
}
void GeomFillFusInt(const TColStd_Array1OfReal& I1,
static void GeomFillFusInt(const TColStd_Array1OfReal& I1,
const TColStd_Array1OfReal& I2,
TColStd_SequenceOfReal& Seq)
{

4
src/GeomFill/GeomFill_Darboux.cxx
View File

@ -130,7 +130,7 @@ static void NormalD0(const Standard_Real U, const Standard_Real V, const Handle(
//function : NormalD1
//purpose : computes Normal to Surface and its first derivative
//=======================================================================
void NormalD1 (const Standard_Real U, const Standard_Real V,
static void NormalD1 (const Standard_Real U, const Standard_Real V,
const Handle(Adaptor3d_HSurface)& Surf, gp_Dir& Normal,
gp_Vec& D1UNormal, gp_Vec& D1VNormal)
{
@ -192,7 +192,7 @@ void NormalD1 (const Standard_Real U, const Standard_Real V,
//function : NormalD2
//purpose : computes Normal to Surface and its first and second derivatives
//=======================================================================
void NormalD2 (const Standard_Real U, const Standard_Real V,
static void NormalD2 (const Standard_Real U, const Standard_Real V,
const Handle(Adaptor3d_HSurface)& Surf, gp_Dir& Normal,
gp_Vec& D1UNormal, gp_Vec& D1VNormal,
gp_Vec& D2UNormal, gp_Vec& D2VNormal, gp_Vec& D2UVNormal)

4
src/GeomFill/GeomFill_NSections.cxx
View File

@ -62,7 +62,7 @@ static Standard_Integer NbSurf = 0;
#ifdef OCCT_DEBUG
// verification des fonctions de derivation D1 et D2 par differences finies
Standard_Boolean verifD1(const TColgp_Array1OfPnt& P1,
static Standard_Boolean verifD1(const TColgp_Array1OfPnt& P1,
const TColStd_Array1OfReal& W1,
const TColgp_Array1OfPnt& P2,
const TColStd_Array1OfReal& W2,
@ -104,7 +104,7 @@ Standard_Boolean verifD1(const TColgp_Array1OfPnt& P1,
return ok;
}
Standard_Boolean verifD2(const TColgp_Array1OfVec& DP1,
static Standard_Boolean verifD2(const TColgp_Array1OfVec& DP1,
const TColStd_Array1OfReal& DW1,
const TColgp_Array1OfVec& DP2,
const TColStd_Array1OfReal& DW2,

4
src/GeomFill/GeomFill_Profiler.cxx
View File

@ -30,7 +30,7 @@
//function : UnifyByInsertingAllKnots
//purpose :
//=======================================================================
void UnifyByInsertingAllKnots(TColGeom_SequenceOfCurve& theCurves,
static void UnifyByInsertingAllKnots(TColGeom_SequenceOfCurve& theCurves,
const Standard_Real PTol)
{
// inserting in the first curve the knot-vector of all the others.
@ -82,7 +82,7 @@ void UnifyByInsertingAllKnots(TColGeom_SequenceOfCurve& theCurves,
//function : UnifyBySettingMiddleKnots
//purpose :
//=======================================================================
void UnifyBySettingMiddleKnots(TColGeom_SequenceOfCurve& theCurves)
static void UnifyBySettingMiddleKnots(TColGeom_SequenceOfCurve& theCurves)
{
Standard_Integer i, j;

3
src/GeomInt/GeomInt_LineTool.cxx
View File

@ -31,6 +31,8 @@
#include <NCollection_StdAllocator.hxx>
#include <TColStd_Array1OfListOfInteger.hxx>
namespace
{
class ProjectPointOnSurf
{
public:
@ -121,6 +123,7 @@ Standard_Real ProjectPointOnSurf::LowerDistance() const
StdFail_NotDone_Raise_if(!myIsDone, "GeomInt_IntSS::ProjectPointOnSurf::LowerDistance");
return sqrt(myExtPS.SquareDistance(myIndex));
}
}
//=======================================================================
//function : AdjustPeriodic

2
src/GeomLProp/GeomLProp.cxx
View File

@ -25,7 +25,7 @@
#include <gp_Vec.hxx>
#include <Precision.hxx>
Standard_Integer GeomAbsToInteger(const GeomAbs_Shape gcont)
static Standard_Integer GeomAbsToInteger(const GeomAbs_Shape gcont)
{
Standard_Integer cont=0 ;
switch (gcont) {