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

[davyw]

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

    Fixes ambiguity errors on bcc32 compiler for 'BRepBuilderAPI_MakeEdge'.
    ('BRepBuilderAPI_MakeEdge::operator TopoDS_Edge()' and 'BRepBuilderAPI_MakeShape::operator TopoDS_Shape')

diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx
index b75a8a1..06d890c 100644
--- a/src/BRepTest/BRepTest_CurveCommands.cxx
+++ b/src/BRepTest/BRepTest_CurveCommands.cxx
@@ -411,7 +411,7 @@ static Standard_Integer edge(Draw_Interpretor& , Standard_Integer n, const char*
   TopoDS_Shape V1 = DBRep::Get(a[2],TopAbs_VERTEX);
   TopoDS_Shape V2 = DBRep::Get(a[3],TopAbs_VERTEX);
   if (V1.IsNull() || V2.IsNull()) return 1;
-  TopoDS_Edge E = BRepBuilderAPI_MakeEdge(TopoDS::Vertex(V1),
+  TopoDS_Edge E = (TopoDS_Edge) BRepBuilderAPI_MakeEdge(TopoDS::Vertex(V1),
 				   TopoDS::Vertex(V2));
   DBRep::Set(a[1],E);
   return 0;
@@ -456,7 +456,7 @@ static Standard_Integer isoedge(Draw_Interpretor& , Standard_Integer n, const ch
     L = new Geom2d_Line(gp_Pnt2d(0,p),gp_Dir2d(1,0));
   }
 
-  TopoDS_Edge E = BRepBuilderAPI_MakeEdge(C,p1,p2);
+  TopoDS_Edge E = (TopoDS_Edge) BRepBuilderAPI_MakeEdge(C,p1,p2);
   E.Location(Loc);
   BRep_Builder B;
   B.UpdateEdge(E,L,TopoDS::Face(Sh),0.);

-- 
OCE packaging