0023664: Eliminate linker warnings on import of local symbol
authorabv <abv@opencascade.com>
Sun, 23 Dec 2012 06:08:16 +0000 (10:08 +0400)
committerabv <abv@opencascade.com>
Fri, 1 Feb 2013 11:42:05 +0000 (15:42 +0400)
Standard_IMPORT removed or replaced by 'export' where it applies to a symbol defined in the same toolkit

107 files changed:
src/BRepAlgo/BRepAlgo_BooleanOperation.cxx
src/BRepFeat/BRepFeat_Form.cxx
src/BRepFeat/BRepFeat_MakeDPrism.cxx
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
src/BRepFeat/BRepFeat_MakePipe.cxx
src/BRepFeat/BRepFeat_MakePrism.cxx
src/BRepFeat/BRepFeat_MakeRevol.cxx
src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
src/BRepFeat/BRepFeat_RibSlot.cxx
src/BiTgte/BiTgte_Blend.cxx
src/ChFi3d/ChFi3d_Builder.cxx
src/ChFi3d/ChFi3d_Builder_2.cxx
src/LocOpe/LocOpe_DPrism.cxx
src/TestTopOpe/TestTopOpe.cxx
src/TestTopOpe/TestTopOpe_BOOP.cxx
src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
src/TestTopOpe/TestTopOpe_HDSCommands.cxx
src/TestTopOpe/TestTopOpe_KroBOOP.cxx
src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx
src/TopOpeBRep/TopOpeBRep_DSFiller.cxx
src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx
src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
src/TopOpeBRep/TopOpeBRep_FFTransitionTool.cxx
src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
src/TopOpeBRep/TopOpeBRep_FaceEdgeIntersector.cxx
src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx
src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
src/TopOpeBRep/TopOpeBRep_FacesIntersector.cxx
src/TopOpeBRep/TopOpeBRep_LineInter.cxx
src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
src/TopOpeBRep/TopOpeBRep_ProcessSectionEdges.cxx
src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
src/TopOpeBRep/TopOpeBRep_VPointInter.cxx
src/TopOpeBRep/TopOpeBRep_kpart.cxx
src/TopOpeBRep/TopOpeBRep_mergePDS.cxx
src/TopOpeBRep/TopOpeBRep_traceSIFF.cxx
src/TopOpeBRep/TopOpeBRep_vpr.cxx
src/TopOpeBRep/TopOpeBRep_vprclo.cxx
src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Area1dBuilder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Area2dBuilder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_BuildEdges.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_BuildFaces.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_1.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_End.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_FREGU.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_FaceBuilder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_FuseFace.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Grid.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_GridFF.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_GridSS.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Griddump.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_PaveClassifier.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_SREGU.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeListOfShape.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceClassifier.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_ShellFaceSet.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_fctwes.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_ffwesk.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_keep.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_kpkole.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_makeedges.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_makefaces.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_makesolids.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_on.cxx
src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx
src/TopOpeBRepDS/TopOpeBRepDS_DataStructure.cxx
src/TopOpeBRepDS/TopOpeBRepDS_EIR.cxx
src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx
src/TopOpeBRepDS/TopOpeBRepDS_FIR.cxx
src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx
src/TopOpeBRepDS/TopOpeBRepDS_Filter.cxx
src/TopOpeBRepDS/TopOpeBRepDS_FilterCurveInterferences.cxx
src/TopOpeBRepDS/TopOpeBRepDS_FilterEdgeInterferences.cxx
src/TopOpeBRepDS/TopOpeBRepDS_FilterFaceInterferences.cxx
src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx
src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx
src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx
src/TopOpeBRepDS/TopOpeBRepDS_ProcessEdgeInterferences.cxx
src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx
src/TopOpeBRepDS/TopOpeBRepDS_ProcessInterferencesTool.cxx
src/TopOpeBRepDS/TopOpeBRepDS_connex.cxx
src/TopOpeBRepDS/TopOpeBRepDS_repvg.cxx
src/TopOpeBRepDS/TopOpeBRepDS_samdom.cxx
src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
src/TopOpeBRepTool/TopOpeBRepTool_FuseEdges.cxx
src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx
src/TopOpeBRepTool/TopOpeBRepTool_PURGE.hxx
src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx
src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx
src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx
src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
src/TopOpeBRepTool/TopOpeBRepTool_faulty.cxx
src/ViewerTest/ViewerTest_ObjectCommands.cxx

index b477e54..b129760 100755 (executable)
@@ -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 
index 165cf3a..1f3a921 100755 (executable)
@@ -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&,
index d13d6be..ddab4dc 100755 (executable)
@@ -85,7 +85,7 @@
 #include <TopAbs.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT();
+extern Standard_Boolean BRepFeat_GettraceFEAT();
 #endif
 
 static void MajMap(const TopoDS_Shape&,
index 4c27c2f..ebb833e 100755 (executable)
 //#include <DbgTools.hxx>
 
 #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
index d3a98ff..3bc0e92 100755 (executable)
@@ -60,7 +60,7 @@
 #include <BRepBndLib.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT();
+extern Standard_Boolean BRepFeat_GettraceFEAT();
 #endif
 
 static void MajMap(const TopoDS_Shape&, // base
index 1b3340c..ba3f39f 100755 (executable)
@@ -82,7 +82,7 @@
 #include <Geom_Plane.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT();
+extern Standard_Boolean BRepFeat_GettraceFEAT();
 #endif
 
 static void MajMap(const TopoDS_Shape&, // base
index 6109b72..b4209ac 100755 (executable)
@@ -81,7 +81,7 @@
 #include <ElCLib.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT();
+extern Standard_Boolean BRepFeat_GettraceFEAT();
 #endif
 
 static void MajMap(const TopoDS_Shape&, // base
index a5e9347..7c5a26a 100755 (executable)
 #include <GeomLProp_CLProps.hxx>
 
 #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
index 407a0a5..f6caa0f 100755 (executable)
 
 
 #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
 
 //=======================================================================
index 1e67b0b..1cafb07 100755 (executable)
 #include <OSD_Chronometer.hxx>
 // 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];
index 5b8fe07..c9f6bf5 100755 (executable)
@@ -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
 
index f807c2d..4083101 100755 (executable)
 #include <DrawTrSurf.hxx>
 #endif
 #include <OSD_Chronometer.hxx>
-//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
index 0ce4d57..1ffe49a 100755 (executable)
@@ -68,7 +68,7 @@
 #include <Standard_ConstructionError.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean BRepFeat_GettraceFEAT();
+extern Standard_Boolean BRepFeat_GettraceFEAT();
 #endif
 
 #define NECHANT 7 // voir BRepFeat.cxx
index fb953c6..c9058a6 100755 (executable)
@@ -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
index 208c36a..d719796 100755 (executable)
 Standard_IMPORT Draw_Viewer dout;
 #endif
 
-Standard_IMPORT Standard_Integer TOPOPE_SeeShape(char *name);
+extern Standard_Integer TOPOPE_SeeShape(char *name);
 
 #ifdef DEB
 #include <TopOpeBRepTool_KRO.hxx>
-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)
index fef716c..b067452 100755 (executable)
 # include <strings.h>
 #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;}
index 2daf655..48a4b03 100755 (executable)
@@ -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<na;i++) {
     a[i]=a[i+1];
@@ -738,7 +738,7 @@ static void tds_help(Draw_Interpretor& di)
 }
 
 typedef Standard_Integer (*tf_SeeShape)(const Standard_Integer I,const TopoDS_Shape& S);
-Standard_IMPORT void OthersCommands_flags(Standard_Integer& na,const char** a,TestTopOpeDraw_Displayer& TD);
+extern void OthersCommands_flags(Standard_Integer& na,const char** a,TestTopOpeDraw_Displayer& TD);
 void COUTNOHDS(Draw_Interpretor& di) {di<<"no current HDS"<<"\n";}
 Standard_Integer tsee_SeeShapefunc(Draw_Interpretor& di,Standard_Integer na_in,const char** a,tf_SeeShape SeeShapefunc)
 {
index 4f081a5..5da2953 100755 (executable)
 
 #ifdef DEB
 #include <TopOpeBRepTool_KRO.hxx>
-//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<<endl;
   KRO_DSFILLER_INTFF.Print(cout); cout<<endl;
index e3ea02e..5e23afd 100755 (executable)
@@ -75,7 +75,7 @@ Standard_EXPORT void DRAWsuppressargs(Standard_Integer& na,const char** a,const
 }
 
 //-----------------------------------------------------------------------
-Standard_EXPORT void OthersCommands_flags(Standard_Integer& na,const char** a,TestTopOpeDraw_Displayer& TD)
+void OthersCommands_flags(Standard_Integer& na,const char** a,TestTopOpeDraw_Displayer& TD)
 //-----------------------------------------------------------------------
 {
   Standard_Integer i,j,l,dloc = 0,iloc,decal = 0, NbArg = na;
index 44823d7..78bb3c1 100755 (executable)
@@ -43,8 +43,8 @@
 #include <TopOpeBRepDS_ShapeWithState.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-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 <TopOpeBRepTool_KRO.hxx>
 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 <TopOpeBRep_traceSIFF.hxx>
 #include <BRepTools.hxx>
 
-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);
   
index 41a669c..b4927c5 100755 (executable)
@@ -38,9 +38,9 @@
 
 #ifdef DEB
 #include <TopOpeBRepDS_reDEB.hxx>
-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"<<IE<<endl;}
 Standard_EXPORT void debposesd(void) {/*cout<<"+++ debposesd"<<endl;*/}
 Standard_EXPORT void debposnesd(void) {cout<<"+++ debposnesd"<<endl;}
index 63f2919..61f9ea5 100755 (executable)
 #include <TopOpeBRep_define.hxx>
 
 #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 <TopOpeBRepTool_KRO.hxx>
 Standard_EXPORT TOPKRO KRO_DSFILLER_INTEE("intersection edge/edge");
 #endif
index c6cf6f8..5008109 100755 (executable)
@@ -40,9 +40,9 @@
 #include <IntPatch_GLine.hxx>
 
 #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
 
index d1a128d..0063202 100755 (executable)
@@ -37,7 +37,7 @@
 #include <gp_Vec.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSF();
+extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 #endif
 
 //-----------------------------------------------------------------------
index 5eb57c9..48f9200 100755 (executable)
@@ -33,9 +33,9 @@
 #include <gp_Pnt2d.hxx>
 
 #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
 
 //=======================================================================
index 9edb1cb..262a89f 100755 (executable)
@@ -36,8 +36,8 @@
 
 #ifdef DEB
 #include <TopAbs.hxx>
-Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceFITOL();
-Standard_IMPORT Standard_Boolean TopOpeBRep_GettraceSAVFF();
+extern Standard_Boolean TopOpeBRep_GettraceFITOL();
+extern Standard_Boolean TopOpeBRep_GettraceSAVFF();
 #include <TCollection_AsciiString.hxx>
 #include <Standard_CString.hxx>
 #include <BRepTools.hxx>
@@ -48,7 +48,7 @@ static void SAVFE(const TopoDS_Face& F1,const TopoDS_Edge& E)
   cout<<"FaceEdgeIntersector : "<<name_1<<","<<name_2<<endl;
   BRepTools::Write(F1,name_1); BRepTools::Write(E,name_2); 
 }
-Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceKRO();
+extern Standard_Boolean TopOpeBRepTool_GettraceKRO();
 #include <TopOpeBRepTool_KRO.hxx>
 Standard_EXPORT TOPKRO KRO_DSFILLER_INTFE("intersection face/edge");
 #endif
index 78dbc56..aba7ac6 100755 (executable)
@@ -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
 
index 8c9ed18..63446a6 100755 (executable)
 Standard_EXPORT void debrest(const Standard_Integer i)   {cout<<"+ debrest "<<i<<endl;}
 Standard_EXPORT void debrline()   {cout<<"+ debrline"<<endl;}
 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceCX(const Standard_Integer i);
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i);
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceISTO(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSP(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC(); 
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSLT();
-Standard_EXPORT Standard_Boolean TopOpeBRep_GettraceNVP(Standard_Integer a,Standard_Integer b,Standard_Integer c,Standard_Integer d,Standard_Integer e);
-Standard_IMPORT Standard_Boolean GLOBAL_bvpr;Standard_EXPORT void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si);
-Standard_EXPORT Standard_Boolean TopOpeBRep_GetcontextNOPUNK();
+extern Standard_Boolean TopOpeBRepDS_GettraceCX(const Standard_Integer i);
+extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i);
+extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceISTO(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSP(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSLT();
+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;
+extern void debvprmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il,Standard_Integer vp,Standard_Integer si);
+extern Standard_Boolean TopOpeBRep_GetcontextNOPUNK();
 
 static void SSAVFF(const TopoDS_Shape& F1, const TopoDS_Shape& F2)
 {
index 02e735e..f1470c5 100755 (executable)
@@ -45,12 +45,12 @@ Standard_EXPORT Standard_Real GLOBAL_tolFF = 1.e-7;
 
 #ifdef DEB
 #include <TopAbs.hxx>
-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 "<<n1<<","<<n2<<endl;BRepTools::Write(F1,n1);BRepTools::Write(F2,n2); 
 }
 
-Standard_EXPORT Standard_Boolean TopOpeBRepTool_GettraceKRO();
+extern Standard_Boolean TopOpeBRepTool_GettraceKRO();
 #include <TopOpeBRepTool_KRO.hxx>
 Standard_EXPORT TOPKRO KRO_DSFILLER_INTFF("intersection face/face");
 
index 4df0ab2..a1d228a 100755 (executable)
 #include <Standard_NotImplemented.hxx>
 
 #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
 
 //-----------------------------------------------------------------------
index 6fc1d2d..af1696c 100755 (executable)
 #include <TopOpeBRep_FFDumper.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom_Line.hxx>
-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;
index ebe9f5a..3a3ed39 100755 (executable)
@@ -36,9 +36,9 @@
 #include <TopTools_MapOfShape.hxx>
 
 #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,
index 389dca4..f058fbd 100755 (executable)
 #include <TopOpeBRep_define.hxx>
 
 #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 : "<<b<<" "<<e1<<","<<e2<<","<<f1<<","<<f2<<endl;TopOpeBRep_SettraceEEFF(b);}
 void seteefft(const Standard_Integer e1,const Standard_Integer e2, const Standard_Integer f1,const Standard_Integer f2) {seteeff(Standard_True,e1,e2,f1,f2);}
index 1950bf9..6371df6 100755 (executable)
@@ -39,7 +39,7 @@
 #include <TopOpeBRep_define.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
+extern Standard_Boolean TopOpeBRepDS_GettraceDSFK(); 
 static TCollection_AsciiString PRODINP("dinp ");
 #endif
 
index e3834a6..138e0fa 100755 (executable)
@@ -40,8 +40,8 @@
 #include <TopOpeBRepDS_define.hxx>
 
 #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<STATIC_lastVPind> 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
 
index c72352b..d362fa5 100755 (executable)
@@ -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;
index 646325b..133eef2 100755 (executable)
@@ -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)
index 80ea946..6b577d7 100755 (executable)
 #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 : "<<f1<<","<<f2<<","<<il<<","<<vp<<","<<si<<endl;cout.flush();debvpr();}
 void debpoint(Standard_Integer i) {cout<<"+ debpoint"<<i<<endl;}
 void debvertex(Standard_Integer i){cout<<"+ debvertex"<<i<<endl;}
index 23a3568..a97f9d2 100755 (executable)
@@ -44,8 +44,8 @@
 #define M_REVERSED(st) (st == TopAbs_REVERSED) 
 
 #ifdef DEB
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF();
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i1);
+extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
+extern Standard_Boolean TopOpeBRepDS_GettraceSPSX(const Standard_Integer i1);
 Standard_EXPORT void debarc(const Standard_Integer i);
 Standard_EXPORT void debooarc(const Standard_Integer i);
 #endif
index a048675..7144fd5 100755 (executable)
@@ -68,8 +68,8 @@ static Standard_Boolean local_FindVertex(const TopOpeBRep_VPointInter& theVP,
 #ifdef DEB
 void static FUN_debdegeneR() {}
 void static FUN_debdegeneF() {}
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDEGEN();
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceDSF();
+extern Standard_Boolean TopOpeBRepDS_GettraceDEGEN();
+extern Standard_Boolean TopOpeBRepDS_GettraceDSF();
 Standard_EXPORT Standard_Boolean FUN_debnull(const TopoDS_Shape& s);
 #endif
 
index 735727d..6a06d86 100755 (executable)
@@ -29,8 +29,8 @@
 #include <TopAbs.hxx>
 
 #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
 
 //=======================================================================
index 1d4b206..ffac50a 100755 (executable)
@@ -23,7 +23,7 @@
 #include <TopOpeBRepBuild_Loop.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceAREA();
+extern Standard_Boolean TopOpeBRepBuild_GettraceAREA();
 #endif
 
 //=======================================================================
index 10fc3cc..5bde666 100755 (executable)
@@ -30,7 +30,9 @@
 #include <Standard_DomainError.hxx>
 #include <TopAbs.hxx>
 
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
+#ifdef DEB
+extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
+#endif
 
 //=======================================================================
 //function : TopOpeBRepBuild_AreaBuilder
index 2b1a3cd..3d763f0 100755 (executable)
@@ -27,7 +27,7 @@
 #include <TopOpeBRepBuild_define.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCU();
+extern Standard_Boolean TopOpeBRepBuild_GettraceCU();
 #endif
 
 //=======================================================================
index 63639f4..8a1c708 100755 (executable)
 #include <BRep_Builder.hxx>
 
 #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
 
 //=======================================================================
index 3cef0a6..f689e72 100755 (executable)
 #include <TopOpeBRepBuild_define.hxx>
 
 #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 "<<i<<endl;}
 Standard_EXPORT void debchangesplit(const Standard_Integer i) {cout<<"++ debchangesplit "<<i<<endl;}
 #endif
index 31fd481..2b66ab0 100755 (executable)
@@ -58,7 +58,7 @@ static TopAbs_State ClassifyEdgeToFaceByOnePoint(const TopoDS_Edge& E,
 //because new algo can not be used in LocOpe and Mechanical Features (for the moment)
 //that's why we use new algo only in BRepAlgoAPI_BooleanOperation
 //in all other cases old algo is called (see the methods GFillSolidSFS, GFillShellSFS, etc.);
-Standard_EXPORT Standard_Boolean GLOBAL_USE_NEW_BUILDER = Standard_False;
+Standard_Boolean GLOBAL_USE_NEW_BUILDER = Standard_False;
 
 //=======================================================================
 //function : Constructor
@@ -1013,7 +1013,7 @@ void TopOpeBRepBuild_Builder1::GFillEdgeSameDomWES(const TopoDS_Shape& EOR,
   }
 } // GFillEdgeWES
 
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_FUN_aresamegeom(const TopoDS_Shape& S1,const TopoDS_Shape& S2);
+extern Standard_Boolean TopOpeBRepBuild_FUN_aresamegeom(const TopoDS_Shape& S1,const TopoDS_Shape& S2);
 
 //=======================================================================
 //function : PerformONParts
index 97836e9..9055652 100755 (executable)
@@ -75,7 +75,7 @@ static TopTools_IndexedMapOfShape processedEdges;
 static TopTools_IndexedMapOfShape theUsedVertexMap;
 static TopTools_MapOfShape theUnkStateVer;
 
-Standard_IMPORT Standard_Boolean GLOBAL_faces2d;
+extern Standard_Boolean GLOBAL_faces2d;
 
 //modified by NIZNHY-PKV Mon Dec 16 11:38:55 2002 f
 //=======================================================================
index f706569..6ddcf41 100755 (executable)
@@ -42,7 +42,7 @@
 #include <TopOpeBRepTool_FuseEdges.hxx>
 #include <Standard_ProgramError.hxx>
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOFE();
+extern Standard_Boolean TopOpeBRepBuild_GetcontextNOFE();
 #endif
 
 //=======================================================================
index 8f22c3c..5d8916d 100755 (executable)
@@ -34,9 +34,9 @@
 #include <TopOpeBRepDS_define.hxx>
 
 #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
 
index d9d1c72..ff53550 100755 (executable)
@@ -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 <TopOpeBRepDS_DSX.hxx>
 void debifb() {}
 #endif
index cdaa2a4..9b95855 100755 (executable)
@@ -62,7 +62,7 @@
 #include <Precision.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFUFA();
+extern Standard_Boolean TopOpeBRepBuild_GettraceFUFA();
 #endif
 
 static void GroupShape(TopTools_ListOfShape&,
index 32b188f..99918fd 100755 (executable)
@@ -26,7 +26,7 @@
 #include <TopOpeBRepBuild_define.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GetcontextSPEON();
+extern Standard_Boolean TopOpeBRepBuild_GetcontextSPEON();
 #endif
 
 //=======================================================================
index c6773a6..0797018 100755 (executable)
@@ -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 "<<i<<endl;}
 #endif
 
 //Standard_IMPORT extern Standard_Boolean GLOBAL_faces2d;
-Standard_IMPORT Standard_Boolean GLOBAL_faces2d;
+extern Standard_Boolean GLOBAL_faces2d;
 
 Standard_EXPORT Standard_Boolean FDS_SIisGIofIofSBAofTofI(const TopOpeBRepDS_DataStructure& BDS,const Standard_Integer SI,const Handle(TopOpeBRepDS_Interference)& I);
 //Standard_IMPORT extern Standard_Boolean GLOBAL_IEtoMERGE; // xpu240498
 Standard_IMPORT Standard_Boolean GLOBAL_IEtoMERGE; // xpu240498
 //Standard_IMPORT extern Standard_Integer GLOBAL_issp;
-Standard_IMPORT Standard_Integer GLOBAL_issp;
+extern Standard_Integer GLOBAL_issp;
 //Standard_IMPORT extern Standard_Integer GLOBAL_hassd;
 Standard_IMPORT Standard_Integer GLOBAL_hassd;
 
index 6e37997..dcf43e8 100755 (executable)
@@ -43,10 +43,9 @@ Standard_IMPORT void FUN_draw2de (const TopoDS_Shape& ed,const TopoDS_Shape& fa)
 #endif
 
 #ifdef DEB
-//Standard_IMPORT extern void* GFABUMAKEFACEPWES_DEB;
-Standard_IMPORT void* GFABUMAKEFACEPWES_DEB;
+extern void* GFABUMAKEFACEPWES_DEB;
 #define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
-Standard_EXPORT Standard_Integer GLOBAL_iexE = 0;
+Standard_Integer GLOBAL_iexE = 0;
 Standard_EXPORT void debfillw(const Standard_Integer /*i*/) {}
 Standard_EXPORT void debfille(const Standard_Integer /*i*/) {}
 Standard_EXPORT void debffwesON(const Standard_Integer i) {cout<<"++ debffwesON "<<i<<endl;}
@@ -56,17 +55,13 @@ Standard_EXPORT void debsplite(const Standard_Integer i) {cout<<"++ debsplite "<
 Standard_EXPORT void debmergef(const Standard_Integer i) {cout<<"++ debmergef "<<i<<endl;}
 Standard_IMPORT void debfctwesmess(const Standard_Integer i,
                                   const TCollection_AsciiString& s = "");
-Standard_IMPORT void debaddpwes(const Standard_Integer iFOR,
-                               const TopAbs_State TB1,
-                               const Standard_Integer iEG,
-                               const TopAbs_Orientation neworiE,
-                               const TopOpeBRepBuild_PBuilder& PB,
-                               const TopOpeBRepBuild_PWireEdgeSet& PWES,
-                               const TCollection_AsciiString& str1,
-                               const TCollection_AsciiString& str2);
+extern void debaddpwes(const Standard_Integer iFOR, const TopAbs_State TB1, const Standard_Integer iEG,
+                       const TopAbs_Orientation neworiE, const TopOpeBRepBuild_PBuilder& PB,
+                       const TopOpeBRepBuild_PWireEdgeSet& PWES, const TCollection_AsciiString& str1, 
+                       const TCollection_AsciiString& str2);
 #endif
 
-Standard_EXPORT Standard_Boolean GLOBAL_faces2d = Standard_False;
+Standard_Boolean GLOBAL_faces2d = Standard_False;
 Standard_EXPORT Standard_Boolean GLOBAL_classifysplitedge = Standard_False;  
 
 #define M_IN(st )      (st == TopAbs_IN)
@@ -120,8 +115,8 @@ static Standard_Boolean FUN_BUI_FACESINTERFER(const TopoDS_Shape& F1,
 //function :TopOpeBRepBuild_FUN_aresamegeom
 //purpose  : 
 //=======================================================================
-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)
 {
   TopoDS_Shape SF1 = S1; 
   SF1.Orientation(TopAbs_FORWARD);
index 0f6b8a9..64e80d7 100755 (executable)
 
 #ifdef DEB
 #define DEBSHASET(sarg,meth,shaset,str) TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
+extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
 Standard_EXPORT void debsplitf(const Standard_Integer i){cout<<"++ debsplitf "<<i<<endl;}
 Standard_EXPORT void debspanc(const Standard_Integer i){cout<<"++ debspanc "<<i<<endl;}
-Standard_EXPORT Standard_Integer GLOBAL_iexF = 0;
+Standard_Integer GLOBAL_iexF = 0;
 #endif
 
 Standard_EXPORT Handle(Geom2d_Curve) BASISCURVE2D(const Handle(Geom2d_Curve)& C);
index 73e3918..898c660 100755 (executable)
@@ -71,8 +71,8 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #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
 
index c2cc474..3f628c4 100755 (executable)
@@ -48,7 +48,7 @@
 #include <Standard_ProgramError.hxx>
 
 #ifdef DEB
-Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceKPB();
+extern Standard_Boolean TopOpeBRepBuild_GettraceKPB();
 #endif
 
 static void FUN_Raise() {
index ac8122e..bed95e8 100755 (executable)
@@ -40,7 +40,7 @@
 #include <BRepCheck_Result.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS();
+extern Standard_Boolean TopOpeBRepBuild_GettraceSPS();
 #endif
 //------------
 //static Standard_Integer ifvNbFace = 0;
index eea48bd..04b6b80 100755 (executable)
@@ -31,8 +31,8 @@
 #include <TopExp.hxx>
 
 #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
 
 //=======================================================================
index da1211f..beca43a 100755 (executable)
@@ -33,7 +33,7 @@
 #include <gp_Pnt.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceVC();
+extern Standard_Boolean TopOpeBRepTool_GettraceVC();
 #include <TopOpeBRepBuild_Builder.hxx>
 #include <gp_Pnt.hxx>
 #endif
index 1691008..db0e8bb 100755 (executable)
@@ -32,9 +32,9 @@
 #include <TopOpeBRepDS_define.hxx>
 
 #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 "<<iS<<endl;}
 #endif
 
index ac2d4b2..db3902f 100755 (executable)
 #define MGhc2 Handle(Geom2d_Curve)
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS();
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceDSNC();
+extern Standard_Boolean TopOpeBRepBuild_GettraceSPS();
+extern Standard_Boolean TopOpeBRepDS_GettraceDSNC();
 Standard_EXPORT void debsplitse(const Standard_Integer) {}
 Standard_EXPORT void debsplitsemess(const Standard_Integer i,const TCollection_AsciiString& s = "");
 Standard_EXPORT void debsplitsemess(const Standard_Integer i,const TCollection_AsciiString& s){cout<<"+++ debsplitse "<<s<<" E"<<i<<endl;debsplitse(i);}
 Standard_EXPORT void debspseou(const Standard_Integer i) {debsplitsemess(i,"OUT");}
 Standard_EXPORT void debspsein(const Standard_Integer i) {debsplitsemess(i,"IN ");}
 Standard_EXPORT void debspseon(const Standard_Integer i) {debsplitsemess(i,"ON ");}
-Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceC2D();
+extern Standard_Boolean TopOpeBRepTool_GettraceC2D();
 #endif
 
 #ifdef DRAW
@@ -651,49 +651,10 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
   mySplitSectionEdgesDone = Standard_True;  
 } // SplitSectionEdges
 
-//Standard_IMPORT extern TopoDS_Shape GLOBALDS_shape1;
-Standard_EXPORTEXTERN TopoDS_Shape GLOBALDS_shape1;
-//Standard_IMPORT extern TopoDS_Shape GLOBALDS_shape2;
-Standard_EXPORTEXTERN TopoDS_Shape GLOBALDS_shape2;
-
-//unused
-/*#ifdef DEB
-static void FUN_removeonGB(const Handle(TopOpeBRepDS_HDataStructure)& HDS, const TopoDS_Edge& E) 
-{
-  // xpu041198 : removing interferences attached to bounds
-  //             or vertices sdm to bounds of edge<EIX>
-  // (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)
index 0c21c12..7464af5 100755 (executable)
 #define Mso Standard_Ostream
 #define Mtcas TCollection_AsciiString
 
-#ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceSPS();
-#endif
-
 //=======================================================================
 //function : TopOpeBRepBuild_ShapeListOfShape
 //purpose  : 
index 12a40d8..dd93771 100755 (executable)
@@ -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
index 3cf2588..c65808a 100755 (executable)
@@ -32,7 +32,7 @@
 #include <BRepAdaptor_Surface.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK();
+extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
 #endif
 
 //=======================================================================
index e29bff0..941efed 100755 (executable)
@@ -31,7 +31,7 @@ static TCollection_AsciiString PRODINS("dins ");
 #include <TopoDS.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK();
+extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
 #endif
 
 //=======================================================================
index b5c341a..97db39b 100755 (executable)
@@ -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;
index 37936e1..7ec5aa5 100755 (executable)
@@ -49,11 +49,11 @@ static TCollection_AsciiString PRODINS("dins ");
 #include <TopOpeBRepTool_2d.hxx>
 
 #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
 
index 0ea2312..955c4ad 100755 (executable)
 Standard_EXPORT void debfctwes(const Standard_Integer /*i*/) {}
 Standard_EXPORT void debfctwesmess(const Standard_Integer i,const TCollection_AsciiString& s = "")
 {cout<<"+ + + debfctwes "<<s<<"F"<<i<<endl;debfctwes(i);}
-Standard_EXPORT void debaddpwes(const Standard_Integer iFOR,const TopAbs_State TB1,const Standard_Integer iEG,const TopAbs_Orientation neworiE,
-                               const TopOpeBRepBuild_PBuilder& PB,const TopOpeBRepBuild_PWireEdgeSet& PWES,const TCollection_AsciiString& str1,const TCollection_AsciiString& str2);
+extern void debaddpwes(const Standard_Integer iFOR,const TopAbs_State TB1,const Standard_Integer iEG,const TopAbs_Orientation neworiE,
+                       const TopOpeBRepBuild_PBuilder& PB,const TopOpeBRepBuild_PWireEdgeSet& PWES,const TCollection_AsciiString& str1,const TCollection_AsciiString& str2);
 #endif
 
-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);
 
 #define M_IN(st )      (st == TopAbs_IN)
 #define M_OUT(st)      (st == TopAbs_OUT)
index 26ab5a4..e705e1e 100755 (executable)
@@ -34,7 +34,7 @@ Standard_EXPORT void debffwesON(const Standard_Integer i);
 Standard_EXPORT void debffwesk(const Standard_Integer i) {cout<<"++ debffwesk "<<i<<endl;}
 #endif
 
-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);
 
 #define M_IN(st )      (st == TopAbs_IN)
 #define M_OUT(st)      (st == TopAbs_OUT)
index ce4a038..98b6ee5 100755 (executable)
@@ -23,8 +23,8 @@
 #include <TopOpeBRepDS_define.hxx>
 
 #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 "<<i<<endl;}
index dfdedad..23de2ce 100755 (executable)
@@ -38,7 +38,7 @@
 #include <Standard_ProgramError.hxx>
 
 #ifdef DEB
-Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceKPB();
+extern Standard_Boolean TopOpeBRepBuild_GettraceKPB();
 void debiskole() {}
 #endif
 
index 6da23e0..f337bd8 100755 (executable)
@@ -29,8 +29,8 @@
 #include <TopOpeBRepBuild_define.hxx>
 
 #ifdef DEB
-Standard_IMPORT void debfillp(const Standard_Integer i);
-Standard_EXPORT void debedbu(const Standard_Integer i) {cout<<"++ debedbu "<<i<<endl;}
+extern void debfillp(const Standard_Integer i);
+extern void debedbu(const Standard_Integer i) {cout<<"++ debedbu "<<i<<endl;}
 #endif
 
 #ifdef DRAW
index 12943d9..46cc487 100755 (executable)
 
 
 #ifdef DEB
-Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOPURGE();
-Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GetcontextNOCORRISO();
-Standard_EXPORT Standard_Boolean TopOpeBRepBuild_GettraceCHK();
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
+extern Standard_Boolean TopOpeBRepBuild_GetcontextNOPURGE();
+extern Standard_Boolean TopOpeBRepBuild_GetcontextNOCORRISO();
+extern Standard_Boolean TopOpeBRepBuild_GettraceCHK();
+extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
 #define DEBSHASET(sarg,meth,shaset,str) \
 TCollection_AsciiString sarg((meth));(sarg)=(sarg)+(shaset).DEBNumber()+(str);
 Standard_EXPORT void debgfabu(const Standard_Integer i) {cout<<"++ debgfabu "<<i<<endl;}
@@ -57,7 +57,7 @@ Standard_EXPORT Standard_Boolean DEBpurclo = Standard_False;
 void debpurclo() {}
 void debpurclomess(Standard_Integer i){cout<<"++ debpurclo "<<i<<endl;debpurclo();}
 Standard_EXPORT void debcorriso(const Standard_Integer i) {cout<<"++ debcorriso "<<i<<endl;}
-Standard_IMPORT void* GFABUMAKEFACEPWES_DEB;
+extern void* GFABUMAKEFACEPWES_DEB;
 #endif
 
 #ifdef DRAW
index 58f37ab..3cbb323 100755 (executable)
@@ -35,7 +35,7 @@
 #include <TopOpeBRepBuild_define.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
+extern Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
 Standard_EXPORT void debgsobu(const Standard_Integer /*iSO*/) {}
 #endif
 
index cc98b25..dcc1a45 100755 (executable)
@@ -24,7 +24,7 @@
 #include <TopOpeBRepBuild_BuilderON.hxx>
 
 //Standard_IMPORT extern Standard_Boolean GLOBAL_faces2d;
-Standard_EXPORTEXTERN Standard_Boolean GLOBAL_faces2d;
+extern Standard_Boolean GLOBAL_faces2d;
 
 //=======================================================================
 //function : GFillONPartsWES
index 549512e..616f1c4 100755 (executable)
 #include <Geom2d_TrimmedCurve.hxx>
 
 #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() ) {
index c52eb50..34bc635 100755 (executable)
 //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 <TCollection_AsciiString.hxx>
 #include <TopOpeBRepDS.hxx>
 #endif
 
-Standard_EXPORT TopoDS_Shape GLOBALDS_shape1;
-Standard_EXPORT TopoDS_Shape GLOBALDS_shape2;
-
 //=======================================================================
 //function : TopOpeBRepDS_DataStructure
 //purpose  : 
index 79f0d0a..0f7610c 100755 (executable)
@@ -38,7 +38,7 @@
 #ifdef DEB
 #include <TopOpeBRepDS_reDEB.hxx>
 Standard_EXPORT void debredpnc(const Standard_Integer ie){cout<<"+++ debredpnc e"<<ie<<endl;}
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GetcontextNOPNC();
+extern Standard_Boolean TopOpeBRepDS_GetcontextNOPNC();
 #endif
 
 #define M_FORWARD(O)  (O == TopAbs_FORWARD)
index e229364..684f16e 100755 (executable)
@@ -56,7 +56,7 @@
 
 #ifdef DEB
 #include <TopOpeBRepDS_reDEB.hxx>
-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"<<i<<endl;}
 Standard_EXPORT void debse2(const Standard_Integer i) {cout<<"+ debse2 se"<<i<<endl;}
 Standard_EXPORT void debse3(const Standard_Integer i) {cout<<"+ debse3 se"<<i<<endl;}
index 10fcfe2..f44e6da 100755 (executable)
@@ -42,8 +42,8 @@
 #define MDSkf TopOpeBRepDS_FACE
 
 #ifdef DEB
-Standard_EXPORT void debrededg(const Standard_Integer I) {cout<<"+++ debrededg f"<<I<<endl;}
-Standard_EXPORT void debredfac(const Standard_Integer I) {cout<<"+++ debredfac f"<<I<<endl;}
+void debrededg(const Standard_Integer I) {cout<<"+++ debrededg f"<<I<<endl;}
+void debredfac(const Standard_Integer I) {cout<<"+++ debredfac f"<<I<<endl;}
 void FUN_dumploiS(const TopoDS_Shape& SG,const TopOpeBRepDS_ListOfInterference& loi,const TopOpeBRepDS_DataStructure& BDS,TCollection_AsciiString str) 
 {
   cout<<str<<"   G : "<<BDS.Shape(SG)<<"   S : ";
@@ -61,11 +61,11 @@ void FUN_dumpmosd(TopOpeBRepDS_MapOfShapeData& mosd,const TopOpeBRepDS_DataStruc
 #endif
 
 #ifdef DEB
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettraceSTRANGE();
-Standard_EXPORT Standard_Boolean TopOpeBRepDS_GettracePEI();
-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_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();
index 96df257..3480c89 100755 (executable)
 #include <TopOpeBRepDS_define.hxx>
 
 #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
index e0eb413..2adbef7 100755 (executable)
@@ -27,9 +27,9 @@
 #include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
 
 #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();
index 8a30471..5ea9e0e 100755 (executable)
@@ -28,8 +28,8 @@
 #include <TopOpeBRepDS_ProcessInterferencesTool.hxx>
 
 #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();
index a04889e..e3abffb 100755 (executable)
 #include <TopOpeBRepDS_define.hxx>
 
 #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();
index 2d702a5..a571c34 100755 (executable)
 #include <TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State.hxx>
 
 #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();
index 6b98756..4d2becb 100755 (executable)
@@ -45,8 +45,8 @@
 #include <Geom2d_Curve.hxx>
 
 #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
 
 //=======================================================================
index 1517499..fb8d9e7 100755 (executable)
@@ -26,7 +26,7 @@
 #include <TopOpeBRepDS_CurvePointInterference.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GettraceGAP();
+extern Standard_Boolean TopOpeBRepDS_GettraceGAP();
 #endif
 
 //=======================================================================
index b75f66f..69a5cf0 100755 (executable)
 #include <TopOpeBRepDS_define.hxx>
 
 #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);
index e917cd2..e07a6ee 100755 (executable)
 #include <TopOpeBRepTool_SC.hxx>
 
 #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();
index c3d5af6..c9b023c 100755 (executable)
@@ -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);
index c4e3103..48ef28c 100755 (executable)
@@ -41,9 +41,9 @@
 #include <TopOpeBRepDS_EXPORT.hxx>
 
 #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();
index 2c20985..e8ffdc5 100755 (executable)
@@ -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;
index 7308625..65b16d1 100755 (executable)
@@ -44,7 +44,7 @@
 
 #ifdef DEB
 #include <TopOpeBRepDS_reDEB.hxx>
-Standard_IMPORT Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG();
+extern Standard_Boolean TopOpeBRepDS_GetcontextMKTONREG();
 #endif
   
 //------------------------------------------------------
index 3aa3919..03dd1f6 100755 (executable)
@@ -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;
index 1e93f7d..414ea57 100755 (executable)
@@ -42,7 +42,7 @@
 #include <BRep_GCurve.hxx>
 
 #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
index e7d5928..cf85375 100755 (executable)
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <BRep_Tool.hxx>
 
-Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettracePCURV();
-Standard_IMPORT Standard_Boolean TopOpeBRepTool_GettraceCHKBSPL();
-
 #ifdef DEB
 #include <TopOpeBRepTool_KRO.hxx>
 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 
index 82282b2..08ff9b3 100755 (executable)
@@ -76,7 +76,7 @@
 #include <BSplCLib.hxx>
 
 #ifdef DEB
-Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFE();
+extern Standard_Boolean TopOpeBRepBuild_GettraceFE();
 #endif
 
 //=======================================================================
index 9b3a9bf..ac9c0a4 100755 (executable)
@@ -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
 
index 4c5f8cd..c3fecfb 100755 (executable)
 #include <gp_Pnt2d.hxx>
 
 #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
index 877cf61..4bb368c 100755 (executable)
@@ -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();
index 320d23f..ccdb888 100755 (executable)
@@ -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)
 {
index 49b87a2..24e8cdc 100755 (executable)
@@ -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();
index 8b75069..9c6f44e 100755 (executable)
@@ -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
 
 
index 0e07111..b4964eb 100755 (executable)
 #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()
index a6586d3..32dc281 100755 (executable)
@@ -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();