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

[davyw]

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

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

diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx
index 1dd8950..a81f965 100644
--- a/src/AIS/AIS_Point.cxx
+++ b/src/AIS/AIS_Point.cxx
@@ -149,7 +149,7 @@ void AIS_Point::UnsetColor()
 TopoDS_Vertex AIS_Point::Vertex() const
 {
   gp_Pnt P = myComponent->Pnt();
-  return BRepBuilderAPI_MakeVertex(P);
+  return (TopoDS_Vertex) BRepBuilderAPI_MakeVertex(P);
 }
 
 //=======================================================================
diff --git a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
index e8a66c7..c5b5051 100644
--- a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
@@ -436,7 +436,7 @@ static void PERFORM_C0(const TopoDS_Edge &S1, const TopoDS_Edge &S2,
       {
         const Standard_Real aParameter = arrInter(i);
         const gp_Pnt aPnt = aAdaptorCurve.Value(aParameter);
-        const TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(aPnt);
+		const TopoDS_Vertex V1 = (const TopoDS_Vertex) BRepBuilderAPI_MakeVertex(aPnt);
 
         BRepExtrema_ExtPC Ext(V1,Eother);
         const Standard_Integer NbExtrema = Ext.IsDone()? Ext.NbExt() : 0;
@@ -1036,7 +1036,7 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Edge& S1, const TopoDS_Face& S
       {
         const Standard_Real aParameter = arrInter(i);
         gp_Pnt aPnt = aAdaptorCurve.Value(aParameter);
-        TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(aPnt);
+	    TopoDS_Vertex V1 = (TopoDS_Vertex) BRepBuilderAPI_MakeVertex(aPnt);
 
         BRepExtrema_ExtPF ExtPF(V1,S2);
         const Standard_Integer NbExtrema = ExtPF.IsDone()? ExtPF.NbExt() : 0;
@@ -1181,7 +1181,7 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Face& S1, const TopoDS_Edge& S
       {
         const Standard_Real aParameter = arrInter(i);
         gp_Pnt aPnt = aAdaptorCurve.Value(aParameter);
-        TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(aPnt);
+		TopoDS_Vertex V1 = (TopoDS_Vertex) BRepBuilderAPI_MakeVertex(aPnt);
 
         BRepExtrema_ExtPF ExtPF(V1,S1);
         const Standard_Integer NbExtrema = ExtPF.IsDone()? ExtPF.NbExt() : 0;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.cxx
index 4091e7b..2c87122 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.cxx
@@ -37,7 +37,7 @@ static Standard_Real FindExtrema(const gp_Pnt&        aPnt,
 {
   Standard_Integer intvalue=0;
   Dist = RealLast();
-  TopoDS_Vertex RefVertex = BRepBuilderAPI_MakeVertex(aPnt);
+  TopoDS_Vertex RefVertex = (TopoDS_Vertex) BRepBuilderAPI_MakeVertex(aPnt);
   
   BRepExtrema_ExtPF ext(RefVertex,aFace);
   

-- 
OCE packaging