From 5e7632824302761b84cfceb5bfb2241d906d0eb4 Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Mon, 6 Sep 2021 10:36:38 +0300
Subject: [PATCH] 0032328: Missing include of TopoDS_Edge.hxx in
 ShapeUpgrade_UnifySameDomain.hxx

---
 .../ShapeUpgrade_UnifySameDomain.cxx          | 28 +++++++++++--------
 .../ShapeUpgrade_UnifySameDomain.hxx          | 21 +++++++++-----
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
index 8e7b86df24..458d79b2aa 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
@@ -13,6 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <ShapeUpgrade_UnifySameDomain.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
@@ -61,7 +62,6 @@
 #include <ShapeFix_Face.hxx>
 #include <ShapeFix_Shell.hxx>
 #include <ShapeFix_Wire.hxx>
-#include <ShapeUpgrade_UnifySameDomain.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom2d_Array1OfBSplineCurve.hxx>
 #include <TColGeom2d_HArray1OfBSplineCurve.hxx>
@@ -2235,17 +2235,21 @@ static Standard_Boolean GetLineEdgePoints(const TopoDS_Edge& theInpEdge, gp_Pnt&
   return Standard_True;
 }
 
-//=======================================================================
-//function : GenerateSubSeq
-//purpose  : Generates sub-sequences of edges from sequence of edges
-//Edges from each subsequences can be merged into the one edge  
-//=======================================================================
+struct ShapeUpgrade_UnifySameDomain::SubSequenceOfEdges
+{
+  TopTools_SequenceOfShape SeqsEdges;
+  TopoDS_Edge UnionEdges;
+};
 
-static void GenerateSubSeq (const TopTools_SequenceOfShape& anInpEdgeSeq,
-                            NCollection_Sequence<SubSequenceOfEdges>& SeqOfSubSeqOfEdges,
-                            Standard_Boolean IsClosed, double theAngTol, double theLinTol, 
-                            const TopTools_MapOfShape& AvoidEdgeVrt,
-                            const TopTools_IndexedDataMapOfShapeListOfShape& theVFmap)
+//=======================================================================
+//function : generateSubSeq
+//purpose  :
+//=======================================================================
+void ShapeUpgrade_UnifySameDomain::generateSubSeq (const TopTools_SequenceOfShape& anInpEdgeSeq,
+                                                   NCollection_Sequence<SubSequenceOfEdges>& SeqOfSubSeqOfEdges,
+                                                   Standard_Boolean IsClosed, double theAngTol, double theLinTol,
+                                                   const TopTools_MapOfShape& AvoidEdgeVrt,
+                                                   const TopTools_IndexedDataMapOfShapeListOfShape& theVFmap)
 {
   Standard_Boolean isOk = Standard_False;
   TopoDS_Edge edge1, edge2;
@@ -2377,7 +2381,7 @@ Standard_Boolean ShapeUpgrade_UnifySameDomain::MergeEdges(TopTools_SequenceOfSha
 
     // split chain by vertices at which merging is not possible
     NCollection_Sequence<SubSequenceOfEdges> aOneSeq;
-    GenerateSubSeq(aChain, aOneSeq, IsClosed, myAngTol, myLinTol, VerticesToAvoid, theVFmap);
+    generateSubSeq(aChain, aOneSeq, IsClosed, myAngTol, myLinTol, VerticesToAvoid, theVFmap);
 
     // put sub-chains in the result
     SeqOfSubSeqOfEdges.Append(aOneSeq);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
index b1558d111f..cb2f6b7d12 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
@@ -65,13 +65,6 @@ DEFINE_STANDARD_HANDLE(ShapeUpgrade_UnifySameDomain, Standard_Transient)
 //! The algorithm provides a place holder for the history and collects the
 //! history by default.
 //! To avoid collecting of the history the place holder should be set to null handle.
-
-struct SubSequenceOfEdges
-{
-  TopTools_SequenceOfShape SeqsEdges;
-  TopoDS_Edge UnionEdges;
-};
-
 class ShapeUpgrade_UnifySameDomain : public Standard_Transient
 {
 
@@ -161,6 +154,10 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_UnifySameDomain,Standard_Transient)
 
+protected:
+
+  struct SubSequenceOfEdges;
+
 protected:
 
   //! This method makes if possible a common face from each
@@ -198,6 +195,16 @@ protected:
   //! Fills the history of the modifications during the operation.
   Standard_EXPORT void FillHistory();
 
+private:
+
+  //! Generates sub-sequences of edges from sequence of edges.
+  //! Edges from each subsequences can be merged into the one edge.
+  static void generateSubSeq (const TopTools_SequenceOfShape& anInpEdgeSeq,
+                              NCollection_Sequence<SubSequenceOfEdges>& SeqOfSubSeqOfEdges,
+                              Standard_Boolean IsClosed, double theAngTol, double theLinTol,
+                              const TopTools_MapOfShape& AvoidEdgeVrt,
+                              const TopTools_IndexedDataMapOfShapeListOfShape& theVFmap);
+
 private:
 
   TopoDS_Shape myInitShape;