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

[davyw]

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

    Fixes ambiguity errors on bcc32 compiler for 'BRepPrimAPI_MakeBox'.
    ('BRepPrimAPI_MakeBox::operator TopoDS_Shell()' and 'BRepPrimAPI_MakeShape::operator TopoDS_Shape')
    ('BRepPrimAPI_MakeBox::operator TopoDS_Solid()' and 'BRepPrimAPI_MakeShape::operator TopoDS_Shape'

diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 1cbe289..d5cf607 100644
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -89,7 +89,7 @@ const Handle(TopoDS_TShape)& VrmlData_Box::TShape ()
   if (myIsModified) {
     try {
       const TopoDS_Shell aShell =
-        BRepPrimAPI_MakeBox (gp_Pnt (-0.5 * mySize),
+        (TopoDS_Shell) BRepPrimAPI_MakeBox (gp_Pnt (-0.5 * mySize),
                              mySize.X(), mySize.Y(), mySize.Z());
       SetTShape (aShell.TShape());
       myIsModified = Standard_False;
diff --git a/test/BRepAlgoAPI_test/boolean_ops.cpp b/test/BRepAlgoAPI_test/boolean_ops.cpp
index 8799d49..3d03ac2 100644
--- a/test/BRepAlgoAPI_test/boolean_ops.cpp
+++ b/test/BRepAlgoAPI_test/boolean_ops.cpp
@@ -8,10 +8,10 @@
 TEST(BRepAlgoAPITestSuite, testCutBox)
 {
     // create the first shape: a cube, a corner at the origin
-    TopoDS_Solid box1 = BRepPrimAPI_MakeBox(10.,10.,10.);
+    TopoDS_Solid box1 = (TopoDS_Solid) BRepPrimAPI_MakeBox(10.,10.,10.);
     ASSERT_FALSE(box1.IsNull());
     // the second shape: a smaller cube, a corner at the origin
-    TopoDS_Solid box2 = BRepPrimAPI_MakeBox(5.,5.,5.);
+    TopoDS_Solid box2 = (TopoDS_Solid) BRepPrimAPI_MakeBox(5.,5.,5.);
     ASSERT_FALSE(box2.IsNull());
     // boolean cut
     TopoDS_Shape shp_result = BRepAlgoAPI_Cut(box1,box2);
diff --git a/test/Standard_StdAllocator_test/Standard_StdAllocator_test.cpp b/test/Standard_StdAllocator_test/Standard_StdAllocator_test.cpp
index 459d8e0..2784c2a 100644
--- a/test/Standard_StdAllocator_test/Standard_StdAllocator_test.cpp
+++ b/test/Standard_StdAllocator_test/Standard_StdAllocator_test.cpp
@@ -28,7 +28,7 @@ TEST(Standard_StdAllocatorTestSuite, testContainers)
 {
     //typed allocator
     std::list<TopoDS_Shape, Standard_StdAllocator<TopoDS_Shape> > aL;
-    TopoDS_Solid aSolid = BRepPrimAPI_MakeBox (10., 20., 30.);
+    TopoDS_Solid aSolid = (TopoDS_Solid) BRepPrimAPI_MakeBox (10., 20., 30.);
     aL.push_back (aSolid);
     ASSERT_EQ(aL.size(), size_t (1));
 

-- 
OCE packaging