From 1d0a9d4d468ac0cdadde4ddc3f25b7629d7f5ab8 Mon Sep 17 00:00:00 2001 From: abv Date: Sun, 23 Dec 2012 10:08:16 +0400 Subject: [PATCH] 0023664: Eliminate linker warnings on import of local symbol Standard_IMPORT removed or replaced by 'export' where it applies to a symbol defined in the same toolkit --- src/BRepAlgo/BRepAlgo_BooleanOperation.cxx | 8 ++-- src/BRepFeat/BRepFeat_Form.cxx | 2 +- src/BRepFeat/BRepFeat_MakeDPrism.cxx | 2 +- src/BRepFeat/BRepFeat_MakeLinearForm.cxx | 4 +- src/BRepFeat/BRepFeat_MakePipe.cxx | 2 +- src/BRepFeat/BRepFeat_MakePrism.cxx | 2 +- src/BRepFeat/BRepFeat_MakeRevol.cxx | 2 +- src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx | 4 +- src/BRepFeat/BRepFeat_RibSlot.cxx | 4 +- src/BiTgte/BiTgte_Blend.cxx | 7 +-- src/ChFi3d/ChFi3d_Builder.cxx | 7 +-- src/ChFi3d/ChFi3d_Builder_2.cxx | 14 ++---- src/LocOpe/LocOpe_DPrism.cxx | 2 +- src/TestTopOpe/TestTopOpe.cxx | 6 +-- src/TestTopOpe/TestTopOpe_BOOP.cxx | 6 +-- src/TestTopOpe/TestTopOpe_BOOPCommands.cxx | 8 ++-- src/TestTopOpe/TestTopOpe_HDSCommands.cxx | 8 ++-- src/TestTopOpe/TestTopOpe_KroBOOP.cxx | 5 -- .../TestTopOpeDraw_OtherCommands.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_DSFiller.cxx | 28 +++++------ src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx | 6 +-- .../TopOpeBRep_EdgesIntersector.cxx | 20 ++++---- src/TopOpeBRep/TopOpeBRep_FFDumper.cxx | 6 +-- .../TopOpeBRep_FFTransitionTool.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx | 4 +- .../TopOpeBRep_FaceEdgeIntersector.cxx | 6 +-- src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx | 6 +-- src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 25 +++++----- .../TopOpeBRep_FacesIntersector.cxx | 12 ++--- src/TopOpeBRep/TopOpeBRep_LineInter.cxx | 8 ++-- src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx | 12 ++--- .../TopOpeBRep_ProcessSectionEdges.cxx | 6 +-- .../TopOpeBRep_ShapeIntersector.cxx | 12 ++--- src/TopOpeBRep/TopOpeBRep_VPointInter.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_kpart.cxx | 6 +-- src/TopOpeBRep/TopOpeBRep_mergePDS.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_vpr.cxx | 14 +++--- src/TopOpeBRep/TopOpeBRep_vprclo.cxx | 4 +- src/TopOpeBRep/TopOpeBRep_vprdeg.cxx | 4 +- .../TopOpeBRepBuild_Area1dBuilder.cxx | 4 +- .../TopOpeBRepBuild_Area2dBuilder.cxx | 2 +- .../TopOpeBRepBuild_AreaBuilder.cxx | 4 +- .../TopOpeBRepBuild_BuildEdges.cxx | 2 +- .../TopOpeBRepBuild_BuildFaces.cxx | 12 ++--- .../TopOpeBRepBuild_Builder.cxx | 12 ++--- .../TopOpeBRepBuild_Builder1.cxx | 4 +- .../TopOpeBRepBuild_Builder1_1.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_End.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx | 6 +-- .../TopOpeBRepBuild_FaceBuilder.cxx | 4 +- .../TopOpeBRepBuild_FuseFace.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx | 2 +- .../TopOpeBRepBuild_GridEE.cxx | 6 +-- .../TopOpeBRepBuild_GridFF.cxx | 23 ++++----- .../TopOpeBRepBuild_GridSS.cxx | 4 +- .../TopOpeBRepBuild_Griddump.cxx | 4 +- src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx | 2 +- .../TopOpeBRepBuild_PaveClassifier.cxx | 4 +- .../TopOpeBRepBuild_PaveSet.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx | 6 +-- .../TopOpeBRepBuild_Section.cxx | 47 ++----------------- .../TopOpeBRepBuild_ShapeListOfShape.cxx | 4 -- .../TopOpeBRepBuild_ShapeSet.cxx | 6 +-- .../TopOpeBRepBuild_ShellFaceClassifier.cxx | 2 +- .../TopOpeBRepBuild_ShellFaceSet.cxx | 2 +- .../TopOpeBRepBuild_WireEdgeClassifier.cxx | 2 +- .../TopOpeBRepBuild_WireEdgeSet.cxx | 10 ++-- .../TopOpeBRepBuild_fctwes.cxx | 6 +-- .../TopOpeBRepBuild_ffwesk.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_keep.cxx | 4 +- .../TopOpeBRepBuild_kpkole.cxx | 2 +- .../TopOpeBRepBuild_makeedges.cxx | 4 +- .../TopOpeBRepBuild_makefaces.cxx | 10 ++-- .../TopOpeBRepBuild_makesolids.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx | 8 ++-- .../TopOpeBRepDS_DataStructure.cxx | 5 +- src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_FIR.cxx | 14 +++--- .../TopOpeBRepDS_FaceInterferenceTool.cxx | 12 ++--- src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx | 6 +-- .../TopOpeBRepDS_FilterCurveInterferences.cxx | 4 +- .../TopOpeBRepDS_FilterEdgeInterferences.cxx | 8 ++-- .../TopOpeBRepDS_FilterFaceInterferences.cxx | 8 ++-- src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx | 4 +- src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx | 2 +- .../TopOpeBRepDS_HDataStructure.cxx | 24 +++++----- .../TopOpeBRepDS_ProcessEdgeInterferences.cxx | 8 ++-- .../TopOpeBRepDS_ProcessFaceInterferences.cxx | 11 ++--- .../TopOpeBRepDS_ProcessInterferencesTool.cxx | 6 +-- src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx | 2 +- src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx | 2 +- .../TopOpeBRepTool_CurveTool.cxx | 7 ++- .../TopOpeBRepTool_FuseEdges.cxx | 2 +- src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx | 4 +- src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx | 12 ++--- src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx | 2 +- src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx | 4 +- .../TopOpeBRepTool_RegularizeW.cxx | 2 +- .../TopOpeBRepTool_ShapeTool.cxx | 4 +- src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx | 8 ++-- src/ViewerTest/ViewerTest_ObjectCommands.cxx | 2 +- 107 files changed, 300 insertions(+), 377 deletions(-) diff --git a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx index b477e54080..b129760bf1 100755 --- a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx +++ b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx @@ -53,7 +53,7 @@ #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GetcontextNOSEW(); +extern Standard_Boolean TopOpeBRepTool_GetcontextNOSEW(); #endif #define Opecom(st1,st2) (((st1)==TopAbs_IN) && ((st2)==TopAbs_IN)) @@ -76,11 +76,11 @@ Standard_IMPORT Standard_Integer TopOpeBRepTool_BOOOPE_CHECK_DEB; //modified by NIZHNY-MZV Wed Apr 19 17:19:11 2000 //see comments at the top of file TopOpeBRepBuild_Builder1.cxx //about using of this global variable -Standard_IMPORT Standard_Boolean GLOBAL_USE_NEW_BUILDER; +extern Standard_Boolean GLOBAL_USE_NEW_BUILDER; // //modified by NIZNHY-PKV Sun Dec 15 17:17:56 2002 f -Standard_IMPORT void FDSCNX_Close();// see TopOpeBRepDS_connex.cxx -Standard_IMPORT void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx +extern void FDSCNX_Close();// see TopOpeBRepDS_connex.cxx +extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx //======================================================================= //function : Delete diff --git a/src/BRepFeat/BRepFeat_Form.cxx b/src/BRepFeat/BRepFeat_Form.cxx index 165cf3a7e6..1f3a921190 100755 --- a/src/BRepFeat/BRepFeat_Form.cxx +++ b/src/BRepFeat/BRepFeat_Form.cxx @@ -72,7 +72,7 @@ //modified by NIZNHY-PKV Thu Mar 21 17:30:29 2002 t #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif static void Descendants(const TopoDS_Shape&, diff --git a/src/BRepFeat/BRepFeat_MakeDPrism.cxx b/src/BRepFeat/BRepFeat_MakeDPrism.cxx index d13d6be9e0..ddab4dc737 100755 --- a/src/BRepFeat/BRepFeat_MakeDPrism.cxx +++ b/src/BRepFeat/BRepFeat_MakeDPrism.cxx @@ -85,7 +85,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif static void MajMap(const TopoDS_Shape&, diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx index 4c27c2fdf9..ebb833e798 100755 --- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -120,8 +120,8 @@ //#include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEATRIB(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEATRIB(); #endif static void MajMap(const TopoDS_Shape&, // base diff --git a/src/BRepFeat/BRepFeat_MakePipe.cxx b/src/BRepFeat/BRepFeat_MakePipe.cxx index d3a98ff227..3bc0e92145 100755 --- a/src/BRepFeat/BRepFeat_MakePipe.cxx +++ b/src/BRepFeat/BRepFeat_MakePipe.cxx @@ -60,7 +60,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif static void MajMap(const TopoDS_Shape&, // base diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx index 1b3340c770..ba3f39f5b2 100755 --- a/src/BRepFeat/BRepFeat_MakePrism.cxx +++ b/src/BRepFeat/BRepFeat_MakePrism.cxx @@ -82,7 +82,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif static void MajMap(const TopoDS_Shape&, // base diff --git a/src/BRepFeat/BRepFeat_MakeRevol.cxx b/src/BRepFeat/BRepFeat_MakeRevol.cxx index 6109b721e8..b4209ac17d 100755 --- a/src/BRepFeat/BRepFeat_MakeRevol.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevol.cxx @@ -81,7 +81,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif static void MajMap(const TopoDS_Shape&, // base diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx index a5e9347135..7c5a26a8b5 100755 --- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx @@ -140,8 +140,8 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEATRIB(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEATRIB(); #endif static void MajMap(const TopoDS_Shape&, // base diff --git a/src/BRepFeat/BRepFeat_RibSlot.cxx b/src/BRepFeat/BRepFeat_RibSlot.cxx index 407a0a5651..f6caa0f418 100755 --- a/src/BRepFeat/BRepFeat_RibSlot.cxx +++ b/src/BRepFeat/BRepFeat_RibSlot.cxx @@ -109,8 +109,8 @@ #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEATRIB(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEATRIB(); #endif //======================================================================= diff --git a/src/BiTgte/BiTgte_Blend.cxx b/src/BiTgte/BiTgte_Blend.cxx index 1e67b0bfcd..1cafb07758 100755 --- a/src/BiTgte/BiTgte_Blend.cxx +++ b/src/BiTgte/BiTgte_Blend.cxx @@ -102,11 +102,8 @@ #include // variables for performance Standard_Real t_mkcurve; -//Standard_IMPORT extern void ChFi3d_InitChron(OSD_Chronometer& ch); -Standard_EXPORT void ChFi3d_InitChron(OSD_Chronometer& ch); -//Standard_IMPORT extern void ChFi3d_ResultChron(OSD_Chronometer & ch, -Standard_IMPORT void ChFi3d_ResultChron(OSD_Chronometer & ch, - Standard_Real& time); +extern void ChFi3d_InitChron(OSD_Chronometer& ch); +extern void ChFi3d_ResultChron(OSD_Chronometer & ch, Standard_Real& time); #ifdef DRAW static Standard_Boolean Affich = Standard_False; static char name[100]; diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx index 5b8fe07f60..c9f6bf50f0 100755 --- a/src/ChFi3d/ChFi3d_Builder.cxx +++ b/src/ChFi3d/ChFi3d_Builder.cxx @@ -93,11 +93,8 @@ t_perf2cornerbyinter,t_chfikpartcompdata,t_cheminement,t_remplissage, t_t3cornerinit ,t_spherique,t_torique, t_notfilling,t_filling,t_sameparam, t_computedata,t_completedata,t_t2cornerDS,t_t3cornerDS; -//Standard_IMPORT extern void ChFi3d_InitChron(OSD_Chronometer& ch); -Standard_IMPORT void ChFi3d_InitChron(OSD_Chronometer& ch); -//Standard_IMPORT extern void ChFi3d_ResultChron(OSD_Chronometer & ch, -Standard_IMPORT void ChFi3d_ResultChron(OSD_Chronometer & ch, - Standard_Real& time); +extern void ChFi3d_InitChron(OSD_Chronometer& ch); +extern void ChFi3d_ResultChron(OSD_Chronometer & ch, Standard_Real& time); extern Standard_Boolean ChFi3d_GettraceCHRON(); #endif diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx index f807c2d9f3..4083101906 100755 --- a/src/ChFi3d/ChFi3d_Builder_2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_2.cxx @@ -102,16 +102,10 @@ #include #endif #include -//Standard_IMPORT extern Standard_Real t_perfsetofkpart,t_perfsetofkgen, -Standard_IMPORT Standard_Real t_perfsetofkpart,t_perfsetofkgen, -t_makextremities,t_performsurf,t_startsol; -//Standard_IMPORT extern Standard_Boolean ChFi3d_GettraceCHRON(); -Standard_IMPORT Standard_Boolean ChFi3d_GettraceCHRON(); -//Standard_IMPORT extern void ChFi3d_InitChron(OSD_Chronometer& ch); -Standard_IMPORT void ChFi3d_InitChron(OSD_Chronometer& ch); -//Standard_IMPORT extern void ChFi3d_ResultChron(OSD_Chronometer & ch, -Standard_IMPORT void ChFi3d_ResultChron(OSD_Chronometer & ch, - Standard_Real& time); +extern Standard_Real t_perfsetofkpart,t_perfsetofkgen,t_makextremities,t_performsurf,t_startsol; +extern Standard_Boolean ChFi3d_GettraceCHRON(); +extern void ChFi3d_InitChron(OSD_Chronometer& ch); +extern void ChFi3d_ResultChron(OSD_Chronometer & ch, Standard_Real& time); #endif // Modified by Sergey KHROMOV - Fri Dec 21 17:08:19 2001 Begin diff --git a/src/LocOpe/LocOpe_DPrism.cxx b/src/LocOpe/LocOpe_DPrism.cxx index 0ce4d5777b..1ffe49a6ee 100755 --- a/src/LocOpe/LocOpe_DPrism.cxx +++ b/src/LocOpe/LocOpe_DPrism.cxx @@ -68,7 +68,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT(); +extern Standard_Boolean BRepFeat_GettraceFEAT(); #endif #define NECHANT 7 // voir BRepFeat.cxx diff --git a/src/TestTopOpe/TestTopOpe.cxx b/src/TestTopOpe/TestTopOpe.cxx index fb953c6c63..c9058a6343 100755 --- a/src/TestTopOpe/TestTopOpe.cxx +++ b/src/TestTopOpe/TestTopOpe.cxx @@ -55,10 +55,8 @@ void TestTopOpe::AllCommands(Draw_Interpretor& theCommands) TestTopOpeDraw::AllCommands(theCommands); } -//Standard_IMPORT extern TestTopOpe_HDSDisplayer* PHDSD; -Standard_IMPORT TestTopOpe_HDSDisplayer* PHDSD; -//Standard_IMPORT extern TestTopOpe_BOOP* PBOOP; -Standard_IMPORT TestTopOpe_BOOP* PBOOP; +extern TestTopOpe_HDSDisplayer* PHDSD; +extern TestTopOpe_BOOP* PBOOP; //======================================================================= //function : Shapes diff --git a/src/TestTopOpe/TestTopOpe_BOOP.cxx b/src/TestTopOpe/TestTopOpe_BOOP.cxx index 208c36a888..d719796d2d 100755 --- a/src/TestTopOpe/TestTopOpe_BOOP.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOP.cxx @@ -53,12 +53,12 @@ Standard_IMPORT Draw_Viewer dout; #endif -Standard_IMPORT Standard_Integer TOPOPE_SeeShape(char *name); +extern Standard_Integer TOPOPE_SeeShape(char *name); #ifdef DEB #include -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceKRO(); -Standard_IMPORT void PrintKRO_PREPA(); +extern Standard_Boolean TopOpeBRepTool_GettraceKRO(); +extern void PrintKRO_PREPA(); #endif Standard_Integer TestTopOpe_BOOP::Prepare(const char* ns1,const char* ns2) diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx index fef716c421..b06745257d 100755 --- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx @@ -34,15 +34,15 @@ # include #endif -Standard_IMPORT void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d); +extern void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d); #ifdef DEB -Standard_IMPORT void TopOpeBRepTool_SettraceEND(const Standard_Boolean); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceEND(); +extern void TopOpeBRepTool_SettraceEND(const Standard_Boolean); +extern Standard_Boolean TopOpeBRepTool_GettraceEND(); #endif static const char* kboo[TESTTOPOPE_NKEYS] = {"topo","secc","sece","sec","com","c12","c21","fus"}; static TestTopOpe_BOOP LOCALBOOP(kboo, "r"); -Standard_EXPORT TestTopOpe_BOOP* PBOOP=&LOCALBOOP; +TestTopOpe_BOOP* PBOOP=&LOCALBOOP; void CATIND (TCollection_AsciiString& s,const Standard_Integer I,const TCollection_AsciiString& a,const TCollection_AsciiString& b) {s=s+a+TCollection_AsciiString(I)+b;} diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx index 2daf6554ce..48a4b03ea4 100755 --- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx @@ -114,8 +114,8 @@ public: #define ISINTEGER(MMstr) ((strspn((MMstr),"0123456789") == strlen((MMstr)))) -Standard_EXPORT TestTopOpe_HDSDisplayer* PHDSD = NULL; -Standard_EXPORT TestTopOpeDraw_Displayer* POCD = NULL; +TestTopOpe_HDSDisplayer* PHDSD = NULL; +static TestTopOpeDraw_Displayer* POCD = NULL; //Standard_IMPORT extern Standard_Integer TopOpeBRepDS_GLOBALHDSinterfselector; Standard_IMPORT Standard_Integer TopOpeBRepDS_GLOBALHDSinterfselector; @@ -587,7 +587,7 @@ static void decalargs(Standard_Integer& na,const char** a,const Standard_Integer //----------------------------------------------------------------------- // suppressarg : remove a[d],modify na-- //----------------------------------------------------------------------- -Standard_EXPORT void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d) +void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d) { for(Standard_Integer i=d;i -//Standard_IMPORT extern TOPKRO KRO_DSFILLER_TOTAL; Standard_IMPORT TOPKRO KRO_DSFILLER_TOTAL; -//Standard_IMPORT extern TOPKRO KRO_DSFILLER_INTFF; Standard_IMPORT TOPKRO KRO_DSFILLER_INTFF; -//Standard_IMPORT extern TOPKRO KRO_DSFILLER_INTEE; Standard_IMPORT TOPKRO KRO_DSFILLER_INTEE; -//Standard_IMPORT extern TOPKRO KRO_DSFILLER_INTFE; Standard_IMPORT TOPKRO KRO_DSFILLER_INTFE; -//Standard_IMPORT extern TOPKRO KRO_CURVETOOL_APPRO; void PrintKRO_PREPA() { KRO_DSFILLER_TOTAL.Print(cout); cout< #include -Standard_IMPORT void BREP_sortonparameter(const Handle(TopOpeBRepDS_HDataStructure)& HDS); -Standard_IMPORT void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); +extern void BREP_sortonparameter(const Handle(TopOpeBRepDS_HDataStructure)& HDS); +extern void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); #ifdef DEB @@ -62,9 +62,9 @@ void debfillerss(const Standard_Integer i1,const Standard_Integer i2){cout<<"+ + #include Standard_EXPORT TOPKRO KRO_DSFILLER_TOTAL("dsfiller"); -Standard_IMPORT TOPKRO KRO_DSFILLER_INTFF; -Standard_IMPORT TOPKRO KRO_DSFILLER_INTEE; -Standard_IMPORT TOPKRO KRO_DSFILLER_INTFE; +extern TOPKRO KRO_DSFILLER_INTFF; +extern TOPKRO KRO_DSFILLER_INTEE; +extern TOPKRO KRO_DSFILLER_INTFE; static void FUN_RESET_KRO_DSFILLER() { KRO_DSFILLER_TOTAL.Reset(); @@ -76,13 +76,13 @@ static void FUN_RESET_KRO_DSFILLER() #include #include -Standard_IMPORT TopOpeBRep_traceSIFF SIFF; +extern TopOpeBRep_traceSIFF SIFF; -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceKRO(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSIFF(); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceEND(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer); -Standard_IMPORT Standard_Boolean TopOpeBRep_GetcontextNONOG(); +extern Standard_Boolean TopOpeBRepTool_GettraceKRO(); +extern Standard_Boolean TopOpeBRep_GettraceSIFF(); +extern Standard_Boolean TopOpeBRepTool_GettraceEND(); +extern Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer); +extern Standard_Boolean TopOpeBRep_GetcontextNONOG(); #endif //======================================================================= @@ -314,9 +314,6 @@ static } // FUN_shareNOG -Standard_IMPORT TopoDS_Shape GLOBALDS_shape1; -Standard_IMPORT TopoDS_Shape GLOBALDS_shape2; - //======================================================================= //function : Insert //purpose : @@ -345,9 +342,6 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1, FBOX_Prepare(); FC2D_Prepare(aS1,aS2); - GLOBALDS_shape1 = aS1; - GLOBALDS_shape2 = aS2; - if (myPShapeClassifier == NULL) myPShapeClassifier = new TopOpeBRepTool_ShapeClassifier(); myFacesFiller.SetPShapeClassifier(myPShapeClassifier); diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx index 41a669c76f..b4927c5959 100755 --- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx @@ -38,9 +38,9 @@ #ifdef DEB #include -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceEDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceEEFF(); +extern Standard_Boolean TopOpeBRepDS_GettraceEDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRep_GettraceEEFF(); Standard_EXPORT void debefre(const Standard_Integer IE) {cout<<"+++ debefre E"< #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceNYI(); -Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceKRO(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceEDSF(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettracePROEDG(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GetcontextTOL0(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GetcontextNOFEI(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceFITOL(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceEEFF(); -Standard_EXPORT void debeeff(); +extern Standard_Boolean TopOpeBRepTool_GettraceNYI(); +extern Standard_Boolean TopOpeBRepTool_GettraceKRO(); +extern Standard_Boolean TopOpeBRepDS_GettraceEDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRep_GettracePROEDG(); +extern Standard_Boolean TopOpeBRep_GetcontextTOL0(); +extern Standard_Boolean TopOpeBRep_GetcontextNOFEI(); +extern Standard_Boolean TopOpeBRep_GettraceFITOL(); +extern Standard_Boolean TopOpeBRep_GettraceEEFF(); +extern void debeeff(); #include Standard_EXPORT TOPKRO KRO_DSFILLER_INTEE("intersection edge/edge"); #endif diff --git a/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx b/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx index c6cf6f8597..50081091c4 100755 --- a/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx @@ -40,9 +40,9 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); static TCollection_AsciiString PRODINP("dinp "); #endif diff --git a/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx b/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx index d1a128df7b..0063202dfb 100755 --- a/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx @@ -37,7 +37,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); #endif //----------------------------------------------------------------------- diff --git a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx index 5eb57c933c..48f92008d6 100755 --- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx @@ -33,9 +33,9 @@ #include #ifdef DEB -Standard_IMPORT void FEINT_DUMPPOINTS(TopOpeBRep_FaceEdgeIntersector& FEINT, +extern void FEINT_DUMPPOINTS(TopOpeBRep_FaceEdgeIntersector& FEINT, const TopOpeBRepDS_DataStructure& BDS); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); #endif //======================================================================= diff --git a/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx index 9edb1cb862..262a89f3c0 100755 --- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx @@ -36,8 +36,8 @@ #ifdef DEB #include -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceFITOL(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSAVFF(); +extern Standard_Boolean TopOpeBRep_GettraceFITOL(); +extern Standard_Boolean TopOpeBRep_GettraceSAVFF(); #include #include #include @@ -48,7 +48,7 @@ static void SAVFE(const TopoDS_Face& F1,const TopoDS_Edge& E) cout<<"FaceEdgeIntersector : "< Standard_EXPORT TOPKRO KRO_DSFILLER_INTFE("intersection face/edge"); #endif diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx index 78dbc56b29..aba7ac6635 100755 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx @@ -62,9 +62,9 @@ Standard_EXPORT Standard_Boolean FUN_projPonL(const gp_Pnt& P,const TopOpeBRep_L } #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); void debffsamdom(void){} #endif diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx index 8c9ed18caa..63446a6a9d 100755 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx @@ -60,18 +60,19 @@ Standard_EXPORT void debrest(const Standard_Integer i) {cout<<"+ debrest "< -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceFI(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceFITOL(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceSAVFF(); +extern Standard_Boolean TopOpeBRep_GettraceFI(); +extern Standard_Boolean TopOpeBRep_GettraceFITOL(); +extern Standard_Boolean TopOpeBRep_GettraceSAVFF(); -Standard_EXPORT Standard_Integer SAVFFi1 = 0; -Standard_EXPORT Standard_Integer SAVFFi2 = 0; +Standard_Integer SAVFFi1 = 0; +Standard_Integer SAVFFi2 = 0; static void SAVFF(const TopoDS_Face& F1,const TopoDS_Face& F2) { TCollection_AsciiString an1("SAVA");if (SAVFFi1) an1=an1+SAVFFi1; @@ -62,7 +62,7 @@ static void SAVFF(const TopoDS_Face& F1,const TopoDS_Face& F2) cout<<"FaceIntersector : write "< Standard_EXPORT TOPKRO KRO_DSFILLER_INTFF("intersection face/face"); diff --git a/src/TopOpeBRep/TopOpeBRep_LineInter.cxx b/src/TopOpeBRep/TopOpeBRep_LineInter.cxx index 4df0ab2964..a1d228a634 100755 --- a/src/TopOpeBRep/TopOpeBRep_LineInter.cxx +++ b/src/TopOpeBRep/TopOpeBRep_LineInter.cxx @@ -46,10 +46,10 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRep_GetcontextALWLNBP(Standard_Integer&); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceCONIC(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRep_GetcontextALWLNBP(Standard_Integer&); +extern Standard_Boolean TopOpeBRep_GettraceCONIC(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); #endif //----------------------------------------------------------------------- diff --git a/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx b/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx index 6fc1d2d0dd..af1696c58a 100755 --- a/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx +++ b/src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx @@ -65,12 +65,12 @@ #include #include #include -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDEGEN(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceBIPS(); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceDEGEN(); -Standard_EXPORT Standard_Boolean FUN_debnull(const TopoDS_Shape& s){Standard_Boolean isnull = s.IsNull(); if (isnull) cout <<"***"; return isnull;} +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRepDS_GettraceDEGEN(); +extern Standard_Boolean TopOpeBRep_GettraceBIPS(); +extern Standard_Boolean TopOpeBRep_GettraceDEGEN(); +extern Standard_Boolean FUN_debnull(const TopoDS_Shape& s){Standard_Boolean isnull = s.IsNull(); if (isnull) cout <<"***"; return isnull;} #endif //Standard_EXPORT extern Standard_Real GLOBAL_tolFF; diff --git a/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx b/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx index ebe9f5a6c2..3a3ed39e84 100755 --- a/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx +++ b/src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx @@ -36,9 +36,9 @@ #include #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); #endif Standard_EXPORT Standard_Boolean FUN_EqualponR(const TopOpeBRep_LineInter& Lrest, diff --git a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx index 389dca47d7..f058fbd7fe 100755 --- a/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx +++ b/src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx @@ -27,12 +27,12 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSI(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GetcontextFFOR(); -Standard_IMPORT Standard_Integer SAVFFi1; // FacesIntersector -Standard_IMPORT Standard_Integer SAVFFi2; // FacesIntersector -Standard_IMPORT void TopOpeBRep_SettraceEEFF(const Standard_Boolean b); -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceEEFF(const Standard_Integer e1,const Standard_Integer e2,const Standard_Integer f1,const Standard_Integer f2); +extern Standard_Boolean TopOpeBRep_GettraceSI(); +extern Standard_Boolean TopOpeBRep_GetcontextFFOR(); +extern Standard_Integer SAVFFi1; // FacesIntersector +extern Standard_Integer SAVFFi2; // FacesIntersector +extern void TopOpeBRep_SettraceEEFF(const Standard_Boolean b); +extern Standard_Boolean TopOpeBRep_GettraceEEFF(const Standard_Integer e1,const Standard_Integer e2,const Standard_Integer f1,const Standard_Integer f2); void seteeff(const Standard_Boolean b,const Standard_Integer e1,const Standard_Integer e2, const Standard_Integer f1,const Standard_Integer f2) {cout<<"b,e1,e2,f1,f2 : "< #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); static TCollection_AsciiString PRODINP("dinp "); #endif diff --git a/src/TopOpeBRep/TopOpeBRep_kpart.cxx b/src/TopOpeBRep/TopOpeBRep_kpart.cxx index e3834a6520..138e0fac59 100755 --- a/src/TopOpeBRep/TopOpeBRep_kpart.cxx +++ b/src/TopOpeBRep/TopOpeBRep_kpart.cxx @@ -40,8 +40,8 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRep_GetcontextNEWKP(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRep_GetcontextNEWKP(); #endif // VP is the vp on which was computed the last CPI. @@ -295,7 +295,7 @@ Standard_Boolean FUNBREP_topowalki_new } // FUNBREP_topowalki_new #ifdef DEB -Standard_IMPORT Standard_Boolean GLOBAL_bvpr; +extern Standard_Boolean GLOBAL_bvpr; Standard_EXPORT void debvpr2(void) {} #endif diff --git a/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx b/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx index c72352bb0d..d362fa5536 100755 --- a/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx +++ b/src/TopOpeBRep/TopOpeBRep_mergePDS.cxx @@ -51,7 +51,7 @@ void BREP_makeIDMOVP(const TopoDS_Shape& S,TopOpeBRepDS_IndexedDataMapOfVertexPo } } -Standard_EXPORT void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) +void BREP_mergePDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) { TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS(); TopOpeBRepDS_CurveExplorer cex(BDS);if (!cex.More()) return; diff --git a/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx b/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx index 646325bb28..133eef252c 100755 --- a/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx +++ b/src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx @@ -118,7 +118,7 @@ void TopOpeBRep_traceSIFF::End(const TCollection_AsciiString& s, } ////////////////////////////////////////////////////////////////////////// -Standard_EXPORT TopOpeBRep_traceSIFF SIFF; +TopOpeBRep_traceSIFF SIFF; Standard_EXPORT void TopOpeBRep_SettraceSIFF(const Standard_Boolean b, Standard_Integer n,char**a) diff --git a/src/TopOpeBRep/TopOpeBRep_vpr.cxx b/src/TopOpeBRep/TopOpeBRep_vpr.cxx index 80ea946aa0..6b577d7cef 100755 --- a/src/TopOpeBRep/TopOpeBRep_vpr.cxx +++ b/src/TopOpeBRep/TopOpeBRep_vpr.cxx @@ -59,13 +59,13 @@ #define M_REVERSED(st) (st == TopAbs_REVERSED) #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceISTO(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSP(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i); -Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e); -Standard_EXPORT Standard_Boolean GLOBAL_bvpr = Standard_False;void debvpr(){}; -Standard_EXPORT void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si) +extern Standard_Boolean TopOpeBRepDS_GettraceISTO(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSP(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i); +extern Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e); +extern Standard_Boolean GLOBAL_bvpr = Standard_False;void debvpr(){}; +void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si) {cout<<"f1,f2,il,vp,si : "< #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceAREA(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepBuild_GettraceAREA(); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx index 1d4b206ad2..ffac50a6ac 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx @@ -23,7 +23,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceAREA(); +extern Standard_Boolean TopOpeBRepBuild_GettraceAREA(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx index 10fc3ccd56..5bde66608a 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx @@ -30,7 +30,9 @@ #include #include -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +#ifdef DEB +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +#endif //======================================================================= //function : TopOpeBRepBuild_AreaBuilder diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx index 2b1a3cdf20..3d763f0707 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx @@ -27,7 +27,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCU(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCU(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx index 63639f4131..8a1c708bc9 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx @@ -28,12 +28,12 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCU(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCUV(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPF(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextSF2(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSHEX(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCU(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCUV(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSPF(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSPS(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextSF2(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSHEX(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx index 3cef0a6e0e..f689e7224d 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx @@ -48,12 +48,12 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCU(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCUV(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPF(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextSF2(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSHEX(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCU(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCUV(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSPF(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSPS(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextSF2(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSHEX(); Standard_EXPORT void debmarksplit(const Standard_Integer i) {cout<<"++ debmarksplit "< #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOFE(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextNOFE(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx index 8f22c3c479..5d8916df3e 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx @@ -34,9 +34,9 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUFA(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSAVFREGU(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUFA(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSAVFREGU(); void debregufa(const Standard_Integer /*iF*/) {} #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx index d9d1c72fc7..ff535509ab 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx @@ -61,8 +61,8 @@ #endif #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettracePURGE(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepBuild_GettracePURGE(); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); #include void debifb() {} #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx index cdaa2a4b2a..9b95855769 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx @@ -62,7 +62,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFUFA(); +extern Standard_Boolean TopOpeBRepBuild_GettraceFUFA(); #endif static void GroupShape(TopTools_ListOfShape&, diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx index 32b188f4f6..99918fdd98 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx @@ -26,7 +26,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextSPEON(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextSPEON(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx index c6773a68a7..0797018f92 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx @@ -58,7 +58,7 @@ Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOSG(); #define M_INTERNAL(st) (st == TopAbs_INTERNAL) #define M_EXTERNAL(st) (st == TopAbs_EXTERNAL) -Standard_EXPORT Standard_Boolean TopOpeBRepBuild_FUN_aresamegeom(const TopoDS_Shape& S1,const TopoDS_Shape& S2); +Standard_Boolean TopOpeBRepBuild_FUN_aresamegeom(const TopoDS_Shape& S1,const TopoDS_Shape& S2); //======================================================================= @@ -237,13 +237,13 @@ void debfillp2(const Standard_Integer i) {cout <<"+ + debfillp2 "< #endif -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer,const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSXX(const Standard_Integer,const Standard_Integer); static TCollection_AsciiString PRODINS("dins "); #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx index c2cc474625..3f628c4b83 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx @@ -48,7 +48,7 @@ #include #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceKPB(); +extern Standard_Boolean TopOpeBRepBuild_GettraceKPB(); #endif static void FUN_Raise() { diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx index ac8122ee8d..bed95e8cbd 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx @@ -40,7 +40,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSPS(); #endif //------------ //static Standard_Integer ifvNbFace = 0; diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx index eea48bd7ec..04b6b80a23 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx @@ -31,8 +31,8 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceVC(); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceCLOV(); +extern Standard_Boolean TopOpeBRepTool_GettraceVC(); +extern Standard_Boolean TopOpeBRepTool_GettraceCLOV(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx index da1211f9f3..beca43a40c 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx @@ -33,7 +33,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceVC(); +extern Standard_Boolean TopOpeBRepTool_GettraceVC(); #include #include #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx index 1691008e55..db0e8bbd35 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx @@ -32,9 +32,9 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUSO(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSAVSREGU(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextNOREGUSO(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextREGUXPU(); +extern Standard_Boolean TopOpeBRepBuild_GettraceSAVSREGU(); Standard_EXPORT void debreguso(const Standard_Integer iS) {cout<<"++ debreguso "< - // (PRO16032, e3on) - TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS(); - TopOpeBRepDS_ListOfInterference& LI = BDS.ChangeShapeInterferences(E); - TopOpeBRepDS_TKI tki; tki.FillOnGeometry(LI); - for (tki.Init(); tki.More(); tki.Next()) { - TopOpeBRepDS_Kind K; Standard_Integer G; tki.Value(K,G); - TopOpeBRepDS_ListOfInterference& loi = tki.ChangeValue(K,G); - if (K==TopOpeBRepDS_VERTEX) { - const TopoDS_Vertex& vG = TopoDS::Vertex(BDS.Shape(G)); - Standard_Integer iv = FUN_tool_orientVinE(vG,E); - if (iv == 0) { - TopoDS_Shape oovG; - Standard_Boolean sdm = FUN_ds_getoov(vG,BDS,oovG); - iv = FUN_tool_orientVinE(TopoDS::Vertex(oovG),E); - } - Standard_Boolean isonboundE = (iv != 0); - if (isonboundE) loi.Clear(); - } - } - LI.Clear(); - for (tki.Init(); tki.More(); tki.Next()) { - TopOpeBRepDS_Kind K; Standard_Integer G; tki.Value(K,G); - TopOpeBRepDS_ListOfInterference& loi = tki.ChangeValue(K,G); - LI.Append(loi); - } -} // FUN_removeonGB -#endif*/ - #define TheIN (1) #define TheON (2) #define TheOUT (3) -Standard_EXPORT Standard_Integer GLOBAL_issp = 0; //++ +Standard_Integer GLOBAL_issp = 0; //++ #define HASSD2d (2) #define HASSD3d (3) diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeListOfShape.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeListOfShape.cxx index 0c21c1264b..7464af5a36 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeListOfShape.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeListOfShape.cxx @@ -49,10 +49,6 @@ #define Mso Standard_Ostream #define Mtcas TCollection_AsciiString -#ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS(); -#endif - //======================================================================= //function : TopOpeBRepBuild_ShapeListOfShape //purpose : diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx index 12a40d8fc4..dd93771fb9 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx @@ -36,9 +36,9 @@ static TCollection_AsciiString PRODINS("dins "); #endif #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHKOK(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHKNOK(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHK(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHKOK(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHKNOK(); Standard_EXPORT void debaddss(){} Standard_IMPORT TopOpeBRepBuild_Builder* LOCAL_PBUILDER_DEB; #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx index 3cf2588ba3..c65808a187 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx @@ -32,7 +32,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHK(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx index e29bff039c..941efed87d 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx @@ -31,7 +31,7 @@ static TCollection_AsciiString PRODINS("dins "); #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHK(); #endif //======================================================================= diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx index b5c341a5e5..97db39bf22 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx @@ -56,7 +56,7 @@ #ifdef DEB #define TSTRA TopOpeBRepDS_GettraceSTRANGE() static TCollection_AsciiString PRODINS("dins "); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); #endif //Standard_IMPORT extern TopOpeBRepBuild_Builder* GLOBAL_PBUILDER; diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx index 37936e1ce5..7ec5aa5fac 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx @@ -49,11 +49,11 @@ static TCollection_AsciiString PRODINS("dins "); #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer i); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSS(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextSSCONNEX(); -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK(); -Standard_EXPORT TopOpeBRepBuild_Builder* LOCAL_PBUILDER_DEB = NULL; +extern Standard_Boolean TopOpeBRep_GettraceSHA(const Standard_Integer i); +extern Standard_Boolean TopOpeBRepBuild_GettraceSS(); +extern Standard_Boolean TopOpeBRepBuild_GetcontextSSCONNEX(); +extern Standard_Boolean TopOpeBRepBuild_GettraceCHK(); +TopOpeBRepBuild_Builder* LOCAL_PBUILDER_DEB = NULL; void debwesclo(const Standard_Integer) {} #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx index 0ea2312501..955c4ad850 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx @@ -35,11 +35,11 @@ Standard_EXPORT void debfctwes(const Standard_Integer /*i*/) {} Standard_EXPORT void debfctwesmess(const Standard_Integer i,const TCollection_AsciiString& s = "") {cout<<"+ + + debfctwes "< #ifdef DEB -Standard_IMPORT Standard_Integer GLOBAL_iexE; -Standard_IMPORT Standard_Integer GLOBAL_iexF; +extern Standard_Integer GLOBAL_iexE; +extern Standard_Integer GLOBAL_iexF; Standard_Boolean STATIC_trace_iexE = Standard_False; Standard_Boolean STATIC_trace_iexF = Standard_False; Standard_EXPORT void debkeep(const Standard_Integer i) {cout<<"++ debkeep "< #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceKPB(); +extern Standard_Boolean TopOpeBRepBuild_GettraceKPB(); void debiskole() {} #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx index 6da23e068f..f337bd82fb 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx @@ -29,8 +29,8 @@ #include #ifdef DEB -Standard_IMPORT void debfillp(const Standard_Integer i); -Standard_EXPORT void debedbu(const Standard_Integer i) {cout<<"++ debedbu "< #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); Standard_EXPORT void debgsobu(const Standard_Integer /*iSO*/) {} #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx index cc98b251c0..dcc1a45d26 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx @@ -24,7 +24,7 @@ #include //Standard_IMPORT extern Standard_Boolean GLOBAL_faces2d; -Standard_EXPORTEXTERN Standard_Boolean GLOBAL_faces2d; +extern Standard_Boolean GLOBAL_faces2d; //======================================================================= //function : GFillONPartsWES diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx index 549512e0b3..616f1c4331 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx @@ -84,10 +84,10 @@ #include #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceBUTO(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceTRPE(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSANTRAN(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); +extern Standard_Boolean TopOpeBRepDS_GettraceBUTO(); +extern Standard_Boolean TopOpeBRepDS_GettraceTRPE(); +extern Standard_Boolean TopOpeBRepDS_GettraceSANTRAN(); static void DUMPCURVES(const Handle(Geom_Curve)& C3D,const TopOpeBRepDS_Curve& C) { if ( !C3D.IsNull() ) { diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx index c52eb50906..34bc635a22 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx @@ -35,14 +35,11 @@ //modified by NIZNHY-PKV Tue Oct 30 09:21:44 2001 t #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); #include #include #endif -Standard_EXPORT TopoDS_Shape GLOBALDS_shape1; -Standard_EXPORT TopoDS_Shape GLOBALDS_shape2; - //======================================================================= //function : TopOpeBRepDS_DataStructure //purpose : diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx index 79f0d0afbf..0f7610ceb7 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx @@ -38,7 +38,7 @@ #ifdef DEB #include Standard_EXPORT void debredpnc(const Standard_Integer ie){cout<<"+++ debredpnc e"< -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); Standard_EXPORT void debse1(const Standard_Integer i) {cout<<"+ debse1 se"< #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePFI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePFI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean FTRCF(const Standard_Integer F) { Standard_Boolean b1 = TopOpeBRepDS_GettracePFI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); @@ -57,7 +57,7 @@ static Standard_Boolean FTRCE(const Standard_Integer E) { Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(E); return (b1 || b2 || b3); }*/ -Standard_IMPORT void debredfac(const Standard_Integer I); +extern void debredfac(const Standard_Integer I); #endif static Standard_Boolean STATIC_TOREVERSE = Standard_False; // xpu150498 diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx index e0eb4134d8..2adbef7181 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx @@ -27,9 +27,9 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); //unreferenced function, commented /*static Standard_Boolean TRCE(const Standard_Integer EIX) { Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx index 8a304713b5..5ea9e0eae2 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx @@ -28,8 +28,8 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePCI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettracePCI(); static Standard_Boolean TRCC() { Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); Standard_Boolean b3 = TopOpeBRepDS_GettracePCI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FilterEdgeInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FilterEdgeInterferences.cxx index a04889e617..e3abffb97d 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_FilterEdgeInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_FilterEdgeInterferences.cxx @@ -29,10 +29,10 @@ #include #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceEDPR(); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceEDPR(); static Standard_Boolean TRCE(const Standard_Integer SIX) { Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FilterFaceInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FilterFaceInterferences.cxx index 2d702a5599..a571c34998 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_FilterFaceInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_FilterFaceInterferences.cxx @@ -31,10 +31,10 @@ #include #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextNOPFI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePFI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GetcontextNOPFI(); +extern Standard_Boolean TopOpeBRepDS_GettracePFI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean TRCF(const Standard_Integer F) { Standard_Boolean b1 = TopOpeBRepDS_GettracePFI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx index 6b987560ae..4d2becbd47 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx @@ -45,8 +45,8 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceGAP(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GetcontextNOGAP(); +extern Standard_Boolean TopOpeBRepDS_GettraceGAP(); +extern Standard_Boolean TopOpeBRepDS_GetcontextNOGAP(); #endif //======================================================================= diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx index 1517499ac8..fb8d9e7b6e 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx @@ -26,7 +26,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceGAP(); +extern Standard_Boolean TopOpeBRepDS_GettraceGAP(); #endif //======================================================================= diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx index b75f66fdb9..69a5cf05c8 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx @@ -43,16 +43,16 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceISTO(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceEDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSFD(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDEGEN(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePCI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceISTO(); +extern Standard_Boolean TopOpeBRepDS_GettraceEDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); +extern Standard_Boolean TopOpeBRepDS_GettraceDSFD(); +extern Standard_Boolean TopOpeBRepDS_GettraceDEGEN(); +extern Standard_Boolean TopOpeBRepDS_GettracePCI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean traceSTORE() { @@ -700,8 +700,8 @@ Standard_Boolean TopOpeBRepDS_HDataStructure::GetGeometry } #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean TRC(const Standard_Integer SIX) { Standard_Boolean b1 = TopOpeBRepDS_GettraceSTRANGE(); Standard_Boolean b2 = TopOpeBRepDS_GettraceSPSX(SIX); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessEdgeInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessEdgeInterferences.cxx index e917cd252e..e07a6ee175 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessEdgeInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessEdgeInterferences.cxx @@ -40,10 +40,10 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceEDPR(); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettraceEDPR(); static Standard_Boolean TRCE(const Standard_Integer SIX) { Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx index c3d5af6e13..c9b023c1d7 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx @@ -63,18 +63,17 @@ Standard_EXPORT void FUN_UNKFstasta(const TopoDS_Face& FF,const TopoDS_Face& FS, #define MAKEFEI(IJKLM) (Handle(TopOpeBRepDS_FaceEdgeInterference)::DownCast(IJKLM)) #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GetcontextNOPFI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePFI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GetcontextNOPFI(); +extern Standard_Boolean TopOpeBRepDS_GettracePFI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean TRCF(const Standard_Integer F) { Standard_Boolean b1 = TopOpeBRepDS_GettracePFI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); Standard_Boolean b3 = TopOpeBRepDS_GettraceSPSX(F); return (b1 || b2 || b3); } -Standard_EXPORT void debrededg(const Standard_Integer I); -Standard_EXPORT void debredunkf(const Standard_Integer /*i*/){}; +static void debredunkf(const Standard_Integer /*i*/){}; #endif Standard_EXPORT Standard_Boolean FUN_Parameters(const gp_Pnt& Pnt,const TopoDS_Shape& F,Standard_Real& u,Standard_Real& v); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessInterferencesTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessInterferencesTool.cxx index c4e3103c7d..48ef28c6e8 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessInterferencesTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessInterferencesTool.cxx @@ -41,9 +41,9 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePEI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettracePI(); -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); +extern Standard_Boolean TopOpeBRepDS_GettracePEI(); +extern Standard_Boolean TopOpeBRepDS_GettracePI(); +extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer); static Standard_Boolean TRCE(const Standard_Integer EIX) { Standard_Boolean b1 = TopOpeBRepDS_GettracePEI(); Standard_Boolean b2 = TopOpeBRepDS_GettracePI(); diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx index 2c20985501..e8ffdc5a37 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx @@ -35,7 +35,7 @@ static Standard_Boolean GLOBAL_FDSCNX_prepared = Standard_False; //function : FDSCNX_Close //purpose : //======================================================================= -Standard_EXPORT void FDSCNX_Close() +void FDSCNX_Close() { if (GLOBAL_elf1) { delete GLOBAL_elf1; diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx index 7308625b6a..65b16d1f72 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx @@ -44,7 +44,7 @@ #ifdef DEB #include -Standard_IMPORT Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG(); +extern Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG(); #endif //------------------------------------------------------ diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx index 3aa3919f01..03dd1f6c12 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx @@ -37,7 +37,7 @@ static Handle(TopOpeBRepDS_HDataStructure)* Ghds; //function :FDSSDM_Close //purpose : //======================================================================= -Standard_EXPORT void FDSSDM_Close() +void FDSSDM_Close() { if (Gps1) { delete Gps1; diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx index 1e93f7d473..414ea5765d 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx @@ -42,7 +42,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceCORRISO(); +extern Standard_Boolean TopOpeBRepTool_GettraceCORRISO(); Standard_EXPORT TopTools_IndexedMapOfShape STATIC_PURGE_mapv; Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds; #endif diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx index e7d5928eb9..cf85375b5f 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx @@ -65,13 +65,12 @@ #include #include -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettracePCURV(); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceCHKBSPL(); - #ifdef DEB #include TOPKRO KRO_CURVETOOL_APPRO("approximation"); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceKRO(); +extern Standard_Boolean TopOpeBRepTool_GettraceKRO(); +extern Standard_Boolean TopOpeBRepTool_GettracePCURV(); +extern Standard_Boolean TopOpeBRepTool_GettraceCHKBSPL(); #endif //#define DRAW //#define IFV diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx index 82282b2d7f..08ff9b37f6 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx @@ -76,7 +76,7 @@ #include #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFE(); +extern Standard_Boolean TopOpeBRepBuild_GettraceFE(); #endif //======================================================================= diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx index 9b3a9bf6c1..ac9c0a4167 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx @@ -52,8 +52,8 @@ //Standard_EXPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds, STATIC_CORR_mapeds; Standard_EXPORT void debcorrUV(){}; -Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettracePURGE(); -Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceCORRISO(); +extern Standard_Boolean TopOpeBRepTool_GettracePURGE(); +extern Standard_Boolean TopOpeBRepTool_GettraceCORRISO(); #endif // DEB diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx index 4c5f8cd068..c3fecfbe80 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx @@ -27,12 +27,12 @@ #include #ifdef DEB -Standard_IMPORT void FUN_REINIT(); -Standard_IMPORT Standard_Integer FUN_addepc(const TopoDS_Shape& ed,const TopoDS_Shape& f); -Standard_IMPORT Standard_Integer FUN_addcheckepc(const TopoDS_Shape& ed,const TopoDS_Shape& f); -Standard_IMPORT Standard_Integer FUN_adds(const TopoDS_Shape& s); -Standard_IMPORT void FUN_tool_trace(const Standard_Integer Index); -Standard_IMPORT void FUN_tool_trace(const gp_Pnt2d p2d); +extern void FUN_REINIT(); +extern Standard_Integer FUN_addepc(const TopoDS_Shape& ed,const TopoDS_Shape& f); +extern Standard_Integer FUN_addcheckepc(const TopoDS_Shape& ed,const TopoDS_Shape& f); +extern Standard_Integer FUN_adds(const TopoDS_Shape& s); +extern void FUN_tool_trace(const Standard_Integer Index); +extern void FUN_tool_trace(const gp_Pnt2d p2d); #endif // ---------------------------------------------------------------------- // TopOpeBRepTool_closing.cxx diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx index 877cf6142e..4bb368cf85 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx @@ -49,7 +49,7 @@ #define CLOSING (5) #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceREGUSO(); +extern Standard_Boolean TopOpeBRepTool_GettraceREGUSO(); static TopTools_IndexedMapOfShape STATIC_mape, STATIC_mapf, STATIC_mapw, STATIC_mapsh; static Standard_Integer FUN_adds(const TopoDS_Shape& s) { TopAbs_ShapeEnum typ = s.ShapeType(); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx index 320d23fe9c..ccdb88861d 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx @@ -47,7 +47,7 @@ #define M_EXTERNAL(ori) (ori == TopAbs_EXTERNAL) #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceREGUFA(); +extern Standard_Boolean TopOpeBRepTool_GettraceREGUFA(); static TopTools_IndexedMapOfShape STATIC_mapf, STATIC_mapw, STATIC_mapv; static TopTools_IndexedMapOfOrientedShape STATIC_mapeds; void FUN_tro(const Standard_Integer i) @@ -73,7 +73,7 @@ Standard_EXPORT Standard_Integer FUN_adds(const TopoDS_Shape& s) { } #endif -Standard_IMPORT void FUN_tool_tori(const TopAbs_Orientation Or); +extern void FUN_tool_tori(const TopAbs_Orientation Or); void FUN_tool_Add(TopTools_DataMapOfShapeListOfShape& map,const TopoDS_Shape& key, const TopoDS_Shape& subitem) { diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx index 49b87a23e3..24e8cdc4fc 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx @@ -47,7 +47,7 @@ #define M_EXTERNAL(sta) (sta == TopAbs_EXTERNAL) #ifdef DEB -Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceREGUFA(); +extern Standard_Boolean TopOpeBRepTool_GettraceREGUFA(); static TopTools_IndexedMapOfShape STATIC_mapw,STATIC_mapf; static Standard_Integer FUN_adds(const TopoDS_Shape& s) { TopAbs_ShapeEnum typ = s.ShapeType(); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx index 8b75069a1f..9c6f44e14d 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx @@ -250,8 +250,8 @@ Standard_Boolean TopOpeBRepTool_ShapeTool::Closed(const TopoDS_Shape& S1, #ifdef DEB -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceVC(); -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceNYI(); +extern Standard_Boolean TopOpeBRepTool_GettraceVC(); +extern Standard_Boolean TopOpeBRepTool_GettraceNYI(); #endif diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx index 0e07111e6b..b4964ebe6e 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx @@ -39,11 +39,9 @@ #endif #ifdef DEB -//Standard_IMPORT extern TopTools_IndexedMapOfShape STATIC_PURGE_mapv; -Standard_IMPORT TopTools_IndexedMapOfShape STATIC_PURGE_mapv; -//Standard_IMPORT extern TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds; -Standard_IMPORT TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds; -Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettracePURGE(); +extern TopTools_IndexedMapOfShape STATIC_PURGE_mapv; +extern TopTools_IndexedMapOfOrientedShape STATIC_PURGE_mapeds; +extern Standard_Boolean TopOpeBRepTool_GettracePURGE(); Standard_EXPORT void FUN_REINIT() {STATIC_PURGE_mapv.Clear(); STATIC_PURGE_mapeds.Clear();} static void FUN_RaiseError() diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index a6586d3031..32dc281102 100755 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -155,7 +155,7 @@ extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theName, const Handle(AIS_InteractiveObject)& theAISObj, Standard_Boolean theReplaceIfExists = Standard_True); -Standard_IMPORT int ViewerMainLoop(Standard_Integer argc, const char** argv); +extern int ViewerMainLoop(Standard_Integer argc, const char** argv); extern Handle(AIS_InteractiveContext)& TheAISContext();