[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

[davyw]

The following commit has been merged in the upstream branch:
commit 36d4e3f1ea97730aed17680461325e1c4e041eab
Author: davyw <davy.wouters at gmail.com>
Date:   Sun Jan 15 14:20:07 2012 +0100

    Fixes ambiguity errors on bcc32 compiler for 'BRepLib_MakeWire'.
    ('BRepLib_MakeWire::operator TopoDS_Wire()' and 'BRepLib_MakeShape::operator TopoDS_Shape')

diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx
index 417bc45..a9171ec 100644
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -2915,8 +2915,8 @@ static TopAbs_Orientation Relative (const TopoDS_Wire&   W1,
   }
   Commun = Standard_True;
 
-  TopoDS_Wire WW1 = BRepLib_MakeWire(E1);
-  TopoDS_Wire WW2 = BRepLib_MakeWire(E2);
+  TopoDS_Wire WW1 = (TopoDS_Wire) BRepLib_MakeWire(E1);
+  TopoDS_Wire WW2 = (TopoDS_Wire) BRepLib_MakeWire(E2);
   Standard_Real Tol = BRepFill_Confusion();
   if (Side(WW1,Tol) < 4 && Side(WW2,Tol) < 4) // les deux a gauche
     return TopAbs_FORWARD;
diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx
index b7fe323..6e86906 100644
--- a/src/BRepFill/BRepFill_Sweep.cxx
+++ b/src/BRepFill/BRepFill_Sweep.cxx
@@ -474,7 +474,7 @@ static void BuildFace(const Handle(Geom_Surface)& S,
 	  TE3->Tolerance( Precision::Confusion() );
 	  TE4->Tolerance( Precision::Confusion() );
 	  
-	  TopoDS_Wire theWire = BRepLib_MakeWire( E1, E2, E3, E4 );
+	  TopoDS_Wire theWire = (TopoDS_Wire) BRepLib_MakeWire( E1, E2, E3, E4 );
 	  Standard_Integer NbPoints = NumberOfPoles( theWire );
 	  if (NbPoints <= 100) //limitation for CPU
 	    {
diff --git a/src/BRepFill/BRepFill_TrimShellCorner.cxx b/src/BRepFill/BRepFill_TrimShellCorner.cxx
index bb9255e..6883531 100644
--- a/src/BRepFill/BRepFill_TrimShellCorner.cxx
+++ b/src/BRepFill/BRepFill_TrimShellCorner.cxx
@@ -2126,7 +2126,7 @@ static Standard_Boolean ChooseSection(const TopoDS_Shape& Comp,
       if (!explo.More())
 	break;
       TopoDS_Edge FirstEdge = TopoDS::Edge( explo.Current() );
-      TopoDS_Wire NewWire = BRepLib_MakeWire( FirstEdge );
+      TopoDS_Wire NewWire = (TopoDS_Wire) BRepLib_MakeWire( FirstEdge );
       B.Remove( OldComp, FirstEdge );
       if (NewWire.Closed())
 	{
@@ -2174,7 +2174,7 @@ static Standard_Boolean ChooseSection(const TopoDS_Shape& Comp,
 	      Standard_Real MinDeviation = RealLast();
 	      for (j = 1; j <= Edges.Length(); j++)
 		{
-		  TopoDS_Wire aWire = BRepLib_MakeWire( NewWire, TopoDS::Edge(Edges(j)) );
+		  TopoDS_Wire aWire = (TopoDS_Wire) BRepLib_MakeWire( NewWire, TopoDS::Edge(Edges(j)) );
 		  gp_Pln aPlane;
 		  Standard_Boolean issing;
 		  Standard_Real Deviation = ComputeAveragePlaneAndMaxDeviation( aWire, aPlane, issing );
diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index af89a95..b650755 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -1753,7 +1753,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
 	while (!edges.IsEmpty())
 	  {
 	    TopoDS_Edge anEdge = TopoDS::Edge( edges.First() );
-	    TopoDS_Wire aWire = BRepLib_MakeWire( anEdge ), resWire;
+	    TopoDS_Wire aWire = (TopoDS_Wire) BRepLib_MakeWire( anEdge ), resWire;
 	    TColStd_SequenceOfInteger Candidates;
 	    for (k = 1; k <= wseq.Length(); k++)
 	      {
@@ -1795,7 +1795,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
 			  }
 		      }
 		  }
-		TopoDS_Wire NewWire = BRepLib_MakeWire( resWire, TopoDS::Edge(edges(Candidates(minind))) );
+		TopoDS_Wire NewWire = (TopoDS_Wire) BRepLib_MakeWire( resWire, TopoDS::Edge(edges(Candidates(minind))) );
 		wseq(k) = NewWire;
 		edges.Remove(Candidates(minind));
 	      }

-- 
OCE packaging