0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / BRepLib / BRepLib_MakeWire.cxx

diff --git a/src/BRepLib/BRepLib_MakeWire.cxx b/src/BRepLib/BRepLib_MakeWire.cxx
index 42ea42e..6c82af2 100644 (file)
--- a/src/BRepLib/BRepLib_MakeWire.cxx
+++ b/src/BRepLib/BRepLib_MakeWire.cxx
@@ -14,27 +14,30 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <BRepLib_MakeWire.ixx>
+
+#include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
-#include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
+#include <BRepLib_MakeWire.hxx>
+#include <Geom_Curve.hxx>
+#include <gp.hxx>
+#include <gp_Pnt.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <gp_Pnt.hxx>
-#include <Geom_Curve.hxx>
-#include <gp.hxx>
-
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopTools_MapIteratorOfMapOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
 //function : BRepLib_MakeWire
 //purpose  : 
 //=======================================================================
-
 BRepLib_MakeWire::BRepLib_MakeWire() :
      myError(BRepLib_EmptyWire)
 {
@@ -279,7 +282,6 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
        // copy the edge
        TopoDS_Shape Dummy = EE.EmptyCopied();
        myEdge = TopoDS::Edge(Dummy);
-       myEdge.Closed(EE.Closed());
        
        for (it.Initialize(EE); it.More(); it.Next()) {
 
@@ -351,7 +353,7 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
       if (V1.IsSame(myVertex)) VRef = V2;
       else if (V2.IsSame(myVertex)) VRef = V1;
       else {
-#if BREPLIB_DEB
+#ifdef OCCT_DEBUG
        cout << "MakeWire : There is a PROBLEM !!" << endl;
 #endif
        myError = BRepLib_NonManifoldWire;
@@ -359,7 +361,7 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
       
       if (VF.IsSame(VL)) {
        // Particular case: it is required to control the orientation
-#if BREPLIB_DEB
+#ifdef OCCT_DEBUG
        if (!VF.IsSame(myVertex))
          cout << "MakeWire : There is a PROBLEM !!" << endl;
 #endif
@@ -369,7 +371,7 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
        if (VF.IsSame(myVertex)) VF = VRef;
        else if (VL.IsSame(myVertex)) VL = VRef;
        else {
-#if BREPLIB_DEB
+#ifdef OCCT_DEBUG
          cout << "MakeWire : Y A UN PROBLEME !!" << endl;
 #endif
          myError = BRepLib_NonManifoldWire;