0026460: Implicit cast to TopoDS_Shape compilation error due to ambiguous conversion

- make operator TopoDS_Shape() cast a "non-const" member function
- make operator TopoDS_*() cast "non-const" when mutating behaviour is possible
- align derived class methods and overrides with the above changes

fix compilation for CR26460
- make argument for IsWRCase2 (non-const) BRepAlgoAPI_BooleanOperation&

diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_Algo.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_Algo.cxx
index ecd7fdfb4ccf5a07e1b039a6ef38960b6cd01785..e2b5c05bc314b4f7415338b8877e99d3409d346d 100644 (file)
--- a/src/BRepAlgoAPI/BRepAlgoAPI_Algo.cxx
+++ b/src/BRepAlgoAPI/BRepAlgoAPI_Algo.cxx
@@ -118,7 +118,7 @@ void BRepAlgoAPI_Algo::UserBreak() const
 //function : Shape
 //purpose  : 
 //=======================================================================
-const TopoDS_Shape& BRepAlgoAPI_Algo::Shape() const
+const TopoDS_Shape& BRepAlgoAPI_Algo::Shape()
 {
   return myShape;
 }

diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx b/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx
index 158dae3aaa0c3555b58b161582c1373a39b0a3f1..6e890e6b07bdc63ecd8ac47d9c51d4456c963511 100644 (file)
--- a/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx
+++ b/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx
@@ -58,7 +58,7 @@ public:
   //! Set the Progress Indicator object.
   Standard_EXPORT void SetProgressIndicator (const Handle(Message_ProgressIndicator)& theObj);
   
-  Standard_EXPORT virtual const TopoDS_Shape& Shape() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TopoDS_Shape& Shape() Standard_OVERRIDE;
 
 
 

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.cxx
index 71fdefd6290212c31a9a88c2fd459ce829e0755f..e1c467eb5ae50aede7db097e80aeb49f53d102d9 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.cxx
@@ -875,7 +875,7 @@ BRepBuilderAPI_EdgeError BRepBuilderAPI_MakeEdge::Error() const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Edge&  BRepBuilderAPI_MakeEdge::Edge()const 
+const TopoDS_Edge&  BRepBuilderAPI_MakeEdge::Edge() 
 {
   return myMakeEdge.Edge();
 }
@@ -909,7 +909,7 @@ const TopoDS_Vertex&  BRepBuilderAPI_MakeEdge::Vertex2()const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakeEdge::operator TopoDS_Edge() const
+BRepBuilderAPI_MakeEdge::operator TopoDS_Edge()
 {
   return Edge();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.hxx
index 7c5d8524d7b84bc0d506e96fe149b5293f2b1d91..20150a970258c6566be83a0a8c8210b67f3e5e1d 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge.hxx
@@ -250,8 +250,8 @@ public:
 
   //! Returns the constructed edge.
   //! Exceptions StdFail_NotDone if the edge is not built.
-  Standard_EXPORT const TopoDS_Edge& Edge() const;
-Standard_EXPORT operator TopoDS_Edge() const;
+  Standard_EXPORT const TopoDS_Edge& Edge();
+  Standard_EXPORT operator TopoDS_Edge();
   
   //! Returns the first vertex of the edge. May be Null.
   Standard_EXPORT const TopoDS_Vertex& Vertex1() const;

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.cxx
index 5e15332d62f5031559711734d606a5c6c3b0e9fc..1a7de2fd0ec62f7b22e5c07ba7ac6d752e85ef4e 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.cxx
@@ -617,7 +617,7 @@ BRepBuilderAPI_EdgeError BRepBuilderAPI_MakeEdge2d::Error() const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Edge&  BRepBuilderAPI_MakeEdge2d::Edge()const 
+const TopoDS_Edge&  BRepBuilderAPI_MakeEdge2d::Edge()
 {
   return myMakeEdge2d.Edge();
 }
@@ -651,7 +651,7 @@ const TopoDS_Vertex&  BRepBuilderAPI_MakeEdge2d::Vertex2()const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakeEdge2d::operator TopoDS_Edge() const
+BRepBuilderAPI_MakeEdge2d::operator TopoDS_Edge()
 {
   return Edge();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.hxx
index 95d373b4687cc5f6f2288975b6929eb7f9dd7422..44bac0067e285f879339fb6039e18685f208df31 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeEdge2d.hxx
@@ -149,8 +149,8 @@ public:
   //! Returns the error description when NotDone.
   Standard_EXPORT BRepBuilderAPI_EdgeError Error() const;
   
-  Standard_EXPORT const TopoDS_Edge& Edge() const;
-Standard_EXPORT operator TopoDS_Edge() const;
+  Standard_EXPORT const TopoDS_Edge& Edge();
+  Standard_EXPORT operator TopoDS_Edge();
   
   //! Returns the first vertex of the edge. May be Null.
   Standard_EXPORT const TopoDS_Vertex& Vertex1() const;

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.cxx
index 1f05a6d98561cd65d3a9131bb98ec7a06d237f7b..15ca15fdfca4b741ff6698f1be46cdf6b01a2501 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.cxx
@@ -236,7 +236,7 @@ const TopoDS_Edge&  BRepBuilderAPI_MakePolygon::Edge()const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Wire&  BRepBuilderAPI_MakePolygon::Wire()const 
+const TopoDS_Wire&  BRepBuilderAPI_MakePolygon::Wire()
 {
   return myMakePolygon.Wire();
 }
@@ -256,7 +256,7 @@ BRepBuilderAPI_MakePolygon::operator TopoDS_Edge() const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakePolygon::operator TopoDS_Wire() const
+BRepBuilderAPI_MakePolygon::operator TopoDS_Wire()
 {
   return Wire();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.hxx
index 1a84d306276ace4302f72044e169dd0b0eb32887..0753ed4901af756234412cd1b7060f6686adf87b 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakePolygon.hxx
@@ -168,8 +168,8 @@ Standard_EXPORT operator TopoDS_Edge() const;
   //! Exceptions
   //! StdFail_NotDone if the wire is not built, i.e. if fewer than
   //! two vertices have been chained together by this construction algorithm.
-  Standard_EXPORT const TopoDS_Wire& Wire() const;
-Standard_EXPORT operator TopoDS_Wire() const;
+  Standard_EXPORT const TopoDS_Wire& Wire();
+  Standard_EXPORT operator TopoDS_Wire();
 
 
 

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
index 119c542734fb0b4d4b3c62586aece50f016f5eeb..95727530b70790d0dd18365f3d7788dfe020fde5 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
@@ -49,7 +49,7 @@ void BRepBuilderAPI_MakeShape::Build()
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Shape&  BRepBuilderAPI_MakeShape::Shape() const
+const TopoDS_Shape&  BRepBuilderAPI_MakeShape::Shape()
 {
   if (!IsDone()) {
     // the following is const cast away
@@ -65,7 +65,7 @@ const TopoDS_Shape&  BRepBuilderAPI_MakeShape::Shape() const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakeShape::operator TopoDS_Shape() const
+BRepBuilderAPI_MakeShape::operator TopoDS_Shape()
 {
   return Shape();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.hxx
index ab87f3eec9e32bdf368e52a17fa98d89ea29271b..acc31608c152ae2d39db487dc95bcec058cabc3c 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.hxx
@@ -50,8 +50,8 @@ Standard_EXPORT virtual ~BRepBuilderAPI_MakeShape(){Delete() ; }
   
   //! Returns a shape built by the shape construction algorithm.
   //! Raises exception StdFail_NotDone if the shape was not built.
-  Standard_EXPORT virtual const TopoDS_Shape& Shape() const;
-Standard_EXPORT operator TopoDS_Shape() const;
+  Standard_EXPORT virtual const TopoDS_Shape& Shape();
+  Standard_EXPORT operator TopoDS_Shape();
   
   //! Returns the  list   of shapes generated   from the
   //! shape <S>.

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.cxx
index f523104e8019f074324a182190d4b48f24f7bc9b..e796d8699d816d8e6b59aee5fdf39e4989c6cce1 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.cxx
@@ -155,7 +155,7 @@ Standard_Boolean BRepBuilderAPI_MakeSolid::IsDone() const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Solid&  BRepBuilderAPI_MakeSolid::Solid()const 
+const TopoDS_Solid&  BRepBuilderAPI_MakeSolid::Solid()
 {
   return myMakeSolid.Solid();
 }
@@ -167,7 +167,7 @@ const TopoDS_Solid&  BRepBuilderAPI_MakeSolid::Solid()const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakeSolid::operator TopoDS_Solid() const
+BRepBuilderAPI_MakeSolid::operator TopoDS_Solid()
 {
   return Solid();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.hxx
index 8e4d27586fb5ead3f0f89bb78a1f51f06130cacc..90c14a3ebd8f1d9ab76e1a010806e62b6a566fe6 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeSolid.hxx
@@ -117,8 +117,8 @@ public:
   Standard_EXPORT virtual Standard_Boolean IsDone() const Standard_OVERRIDE;
   
   //! Returns the new Solid.
-  Standard_EXPORT const TopoDS_Solid& Solid() const;
-Standard_EXPORT operator TopoDS_Solid() const;
+  Standard_EXPORT const TopoDS_Solid& Solid();
+  Standard_EXPORT operator TopoDS_Solid();
   
   Standard_EXPORT virtual Standard_Boolean IsDeleted (const TopoDS_Shape& S) Standard_OVERRIDE;
 

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.cxx
index 6ceb7e4203855099821b2bed7bae6dfc630c17b6..8620832d4b833621d4d5564a5d397882483126f5 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.cxx
@@ -41,7 +41,7 @@ BRepBuilderAPI_MakeVertex::BRepBuilderAPI_MakeVertex(const gp_Pnt& P)
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Vertex&  BRepBuilderAPI_MakeVertex::Vertex()const 
+const TopoDS_Vertex&  BRepBuilderAPI_MakeVertex::Vertex()
 {
   return myMakeVertex.Vertex();
 }
@@ -53,7 +53,7 @@ const TopoDS_Vertex&  BRepBuilderAPI_MakeVertex::Vertex()const
 //=======================================================================
 
 
-BRepBuilderAPI_MakeVertex::operator TopoDS_Vertex() const
+BRepBuilderAPI_MakeVertex::operator TopoDS_Vertex()
 {
   return Vertex();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.hxx
index c5b48b901a08b20524ab071229e07b62d5c968e6..3356af307c7644f87865ba4030450825607de5f3 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeVertex.hxx
@@ -50,8 +50,8 @@ public:
   Standard_EXPORT BRepBuilderAPI_MakeVertex(const gp_Pnt& P);
   
   //! Returns the constructed vertex.
-  Standard_EXPORT const TopoDS_Vertex& Vertex() const;
-Standard_EXPORT operator TopoDS_Vertex() const;
+  Standard_EXPORT const TopoDS_Vertex& Vertex();
+  Standard_EXPORT operator TopoDS_Vertex();
 
 
 

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.cxx
index 896c5880a3d8aed7280f8d825a74cffb9490ba20..4b0a5a6d90af0372274f1fa921bb2f7303ff1658 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.cxx
@@ -175,7 +175,7 @@ void  BRepBuilderAPI_MakeWire::Add(const TopTools_ListOfShape& L)
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Wire&  BRepBuilderAPI_MakeWire::Wire()const 
+const TopoDS_Wire&  BRepBuilderAPI_MakeWire::Wire()
 {
   return myMakeWire.Wire();
 }
@@ -208,7 +208,7 @@ const TopoDS_Vertex&  BRepBuilderAPI_MakeWire::Vertex()const
 //purpose  : 
 //=======================================================================
 
-BRepBuilderAPI_MakeWire::operator TopoDS_Wire() const
+BRepBuilderAPI_MakeWire::operator TopoDS_Wire()
 {
   return Wire();
 }

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.hxx
index 759bde53353acd92c8223b84fdad1b87d7c3aafc..97f8f90080253c12a42f4d3ed8dba8c789826c0a 100644 (file)
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeWire.hxx
@@ -160,8 +160,8 @@ public:
   //! Returns the constructed wire; or the part of the wire
   //! under construction already built.
   //! Exceptions StdFail_NotDone if a wire is not built.
-  Standard_EXPORT const TopoDS_Wire& Wire() const;
-Standard_EXPORT operator TopoDS_Wire() const;
+  Standard_EXPORT const TopoDS_Wire& Wire();
+  Standard_EXPORT operator TopoDS_Wire();
   
   //! Returns the last edge added to the wire under construction.
   //! Warning

diff --git a/src/BRepLib/BRepLib_MakeEdge.cxx b/src/BRepLib/BRepLib_MakeEdge.cxx
index e8b9985c70ac096847018f5d1ad74524c48864df..6a3d8d52d6294f015849545ef489fc50e25da57a 100644 (file)
--- a/src/BRepLib/BRepLib_MakeEdge.cxx
+++ b/src/BRepLib/BRepLib_MakeEdge.cxx
@@ -1214,7 +1214,7 @@ BRepLib_EdgeError BRepLib_MakeEdge::Error() const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Edge&  BRepLib_MakeEdge::Edge()const 
+const TopoDS_Edge&  BRepLib_MakeEdge::Edge()
 {
   return TopoDS::Edge(Shape());
 }
@@ -1250,7 +1250,7 @@ const TopoDS_Vertex&  BRepLib_MakeEdge::Vertex2()const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakeEdge::operator TopoDS_Edge() const
+BRepLib_MakeEdge::operator TopoDS_Edge()
 {
   return Edge();
 }

diff --git a/src/BRepLib/BRepLib_MakeEdge.hxx b/src/BRepLib/BRepLib_MakeEdge.hxx
index f192eaf9c69b5dc3c86021cc9fbf04beef02cf42..4b80180dc2e4deda3d490391027aa5354f73748d 100644 (file)
--- a/src/BRepLib/BRepLib_MakeEdge.hxx
+++ b/src/BRepLib/BRepLib_MakeEdge.hxx
@@ -174,8 +174,8 @@ public:
   //! Returns the error description when NotDone.
   Standard_EXPORT BRepLib_EdgeError Error() const;
   
-  Standard_EXPORT const TopoDS_Edge& Edge() const;
-Standard_EXPORT operator TopoDS_Edge() const;
+  Standard_EXPORT const TopoDS_Edge& Edge();
+  Standard_EXPORT operator TopoDS_Edge();
   
   //! Returns the first vertex of the edge. May be Null.
   Standard_EXPORT const TopoDS_Vertex& Vertex1() const;

diff --git a/src/BRepLib/BRepLib_MakeEdge2d.cxx b/src/BRepLib/BRepLib_MakeEdge2d.cxx
index e6f83ce0b3570a6ffee7bbc1fb517c85ab2f045a..f04af3e5a8d3b8a966662c6f02b0c110c268c32a 100644 (file)
--- a/src/BRepLib/BRepLib_MakeEdge2d.cxx
+++ b/src/BRepLib/BRepLib_MakeEdge2d.cxx
@@ -738,7 +738,7 @@ BRepLib_EdgeError BRepLib_MakeEdge2d::Error() const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Edge&  BRepLib_MakeEdge2d::Edge()const 
+const TopoDS_Edge&  BRepLib_MakeEdge2d::Edge()
 {
   return TopoDS::Edge(Shape());
 }
@@ -774,7 +774,7 @@ const TopoDS_Vertex&  BRepLib_MakeEdge2d::Vertex2()const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakeEdge2d::operator TopoDS_Edge() const
+BRepLib_MakeEdge2d::operator TopoDS_Edge()
 {
   return Edge();
 }

diff --git a/src/BRepLib/BRepLib_MakeEdge2d.hxx b/src/BRepLib/BRepLib_MakeEdge2d.hxx
index 85fb341a7b42f4628db84d18e4d1c3eeac2c706f..e6860368f2591bc6b1c5e8186f2d2c4112f30b4c 100644 (file)
--- a/src/BRepLib/BRepLib_MakeEdge2d.hxx
+++ b/src/BRepLib/BRepLib_MakeEdge2d.hxx
@@ -146,8 +146,8 @@ public:
   //! Returns the error description when NotDone.
   Standard_EXPORT BRepLib_EdgeError Error() const;
   
-  Standard_EXPORT const TopoDS_Edge& Edge() const;
-Standard_EXPORT operator TopoDS_Edge() const;
+  Standard_EXPORT const TopoDS_Edge& Edge();
+  Standard_EXPORT operator TopoDS_Edge();
   
   //! Returns the first vertex of the edge. May be Null.
   Standard_EXPORT const TopoDS_Vertex& Vertex1() const;

diff --git a/src/BRepLib/BRepLib_MakePolygon.cxx b/src/BRepLib/BRepLib_MakePolygon.cxx
index a3be9f6094a01872a3e40a0fef57cecf7c5ecf38..18965a87178c9c98ea978c84bcdb4d8cd736607f 100644 (file)
--- a/src/BRepLib/BRepLib_MakePolygon.cxx
+++ b/src/BRepLib/BRepLib_MakePolygon.cxx
@@ -271,7 +271,7 @@ const TopoDS_Edge&  BRepLib_MakePolygon::Edge()const
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Wire&  BRepLib_MakePolygon::Wire()const 
+const TopoDS_Wire&  BRepLib_MakePolygon::Wire() 
 {
   return TopoDS::Wire(Shape());
 }
@@ -291,7 +291,7 @@ BRepLib_MakePolygon::operator TopoDS_Edge() const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakePolygon::operator TopoDS_Wire() const
+BRepLib_MakePolygon::operator TopoDS_Wire()
 {
   return Wire();
 }

diff --git a/src/BRepLib/BRepLib_MakePolygon.hxx b/src/BRepLib/BRepLib_MakePolygon.hxx
index 0ebc42b2a455e4f132197ca0b1c133670432f8ee..085cd9e72b9816da17cf03f1785c6c6c343a9538 100644 (file)
--- a/src/BRepLib/BRepLib_MakePolygon.hxx
+++ b/src/BRepLib/BRepLib_MakePolygon.hxx
@@ -87,8 +87,8 @@ public:
   Standard_EXPORT const TopoDS_Edge& Edge() const;
 Standard_EXPORT operator TopoDS_Edge() const;
   
-  Standard_EXPORT const TopoDS_Wire& Wire() const;
-Standard_EXPORT operator TopoDS_Wire() const;
+  Standard_EXPORT const TopoDS_Wire& Wire();
+  Standard_EXPORT operator TopoDS_Wire();
 
 
 

diff --git a/src/BRepLib/BRepLib_MakeShape.cxx b/src/BRepLib/BRepLib_MakeShape.cxx
index 2ddbad26080f7079d0fbb1ccafac2dc37a040926..c8df93fc8ee09c836005afbf0b504a8d7974fc53 100644 (file)
--- a/src/BRepLib/BRepLib_MakeShape.cxx
+++ b/src/BRepLib/BRepLib_MakeShape.cxx
@@ -43,7 +43,7 @@ void BRepLib_MakeShape::Build()
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Shape&  BRepLib_MakeShape::Shape() const
+const TopoDS_Shape&  BRepLib_MakeShape::Shape()
 {
   if (!IsDone()) {
     // the following is const cast away
@@ -59,7 +59,7 @@ const TopoDS_Shape&  BRepLib_MakeShape::Shape() const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakeShape::operator TopoDS_Shape() const
+BRepLib_MakeShape::operator TopoDS_Shape()
 {
   return Shape();
 }

diff --git a/src/BRepLib/BRepLib_MakeShape.hxx b/src/BRepLib/BRepLib_MakeShape.hxx
index 461b4c8344b202fe71132f35c7d9c1e58216c1c2..64c151bc685d56643d84518d6d163fbc44f1b6bb 100644 (file)
--- a/src/BRepLib/BRepLib_MakeShape.hxx
+++ b/src/BRepLib/BRepLib_MakeShape.hxx
@@ -49,8 +49,8 @@ public:
   //! may be redefined.
   Standard_EXPORT void Build();
   
-  Standard_EXPORT const TopoDS_Shape& Shape() const;
-Standard_EXPORT operator TopoDS_Shape() const;
+  Standard_EXPORT const TopoDS_Shape& Shape();
+  Standard_EXPORT operator TopoDS_Shape();
   
   //! returns the status of the Face after
   //! the shape creation.

diff --git a/src/BRepLib/BRepLib_MakeSolid.cxx b/src/BRepLib/BRepLib_MakeSolid.cxx
index 2342ac3bb1807daa33df296ccdcae2d13ba41662..178fb9ddfb2671e79e77e4f4cb425aa50174c2ed 100644 (file)
--- a/src/BRepLib/BRepLib_MakeSolid.cxx
+++ b/src/BRepLib/BRepLib_MakeSolid.cxx
@@ -170,7 +170,7 @@ void  BRepLib_MakeSolid::Add(const TopoDS_Shell& S)
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Solid&  BRepLib_MakeSolid::Solid()const 
+const TopoDS_Solid&  BRepLib_MakeSolid::Solid()
 {
   return TopoDS::Solid(Shape());
 }
@@ -182,7 +182,7 @@ const TopoDS_Solid&  BRepLib_MakeSolid::Solid()const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakeSolid::operator TopoDS_Solid() const
+BRepLib_MakeSolid::operator TopoDS_Solid()
 {
   return TopoDS::Solid(Shape());
 }

diff --git a/src/BRepLib/BRepLib_MakeSolid.hxx b/src/BRepLib/BRepLib_MakeSolid.hxx
index d1be543dad77c6a20f1cae44613c6d20bb54849f..b476db83fc6baacda6933ec55b438a47c1b31ad2 100644 (file)
--- a/src/BRepLib/BRepLib_MakeSolid.hxx
+++ b/src/BRepLib/BRepLib_MakeSolid.hxx
@@ -64,8 +64,8 @@ public:
   Standard_EXPORT void Add (const TopoDS_Shell& S);
   
   //! Returns the new Solid.
-  Standard_EXPORT const TopoDS_Solid& Solid() const;
-Standard_EXPORT operator TopoDS_Solid() const;
+  Standard_EXPORT const TopoDS_Solid& Solid();
+  Standard_EXPORT operator TopoDS_Solid();
   
   //! returns the status of the Face after
   //! the shape creation.

diff --git a/src/BRepLib/BRepLib_MakeVertex.cxx b/src/BRepLib/BRepLib_MakeVertex.cxx
index 8dcc1bbfffa432f3aa8a91aa58db9f6989a3c339..f76871bf9cfee13c252b1fff70cfacc3a4f5ea8f 100644 (file)
--- a/src/BRepLib/BRepLib_MakeVertex.cxx
+++ b/src/BRepLib/BRepLib_MakeVertex.cxx
@@ -39,7 +39,7 @@ BRepLib_MakeVertex::BRepLib_MakeVertex(const gp_Pnt& P)
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Vertex&  BRepLib_MakeVertex::Vertex()const 
+const TopoDS_Vertex&  BRepLib_MakeVertex::Vertex() 
 {
   return TopoDS::Vertex(Shape());
 }
@@ -51,7 +51,7 @@ const TopoDS_Vertex&  BRepLib_MakeVertex::Vertex()const
 //=======================================================================
 
 
-BRepLib_MakeVertex::operator TopoDS_Vertex() const
+BRepLib_MakeVertex::operator TopoDS_Vertex()
 {
   return Vertex();
 }

diff --git a/src/BRepLib/BRepLib_MakeVertex.hxx b/src/BRepLib/BRepLib_MakeVertex.hxx
index 64a0e11aa94ddb191af851d7af4d64046031ed91..a84d9c6bdccca42f80ddb7603d1231252b35534a 100644 (file)
--- a/src/BRepLib/BRepLib_MakeVertex.hxx
+++ b/src/BRepLib/BRepLib_MakeVertex.hxx
@@ -36,8 +36,8 @@ public:
   
   Standard_EXPORT BRepLib_MakeVertex(const gp_Pnt& P);
   
-  Standard_EXPORT const TopoDS_Vertex& Vertex() const;
-Standard_EXPORT operator TopoDS_Vertex() const;
+  Standard_EXPORT const TopoDS_Vertex& Vertex();
+  Standard_EXPORT operator TopoDS_Vertex();
 
 
 

diff --git a/src/BRepLib/BRepLib_MakeWire.cxx b/src/BRepLib/BRepLib_MakeWire.cxx
index 6c82af20dcb9701955aef3a3609655c0ff2e429c..ef02e24c82185765c4a038e359e7c53ca461ab2d 100644 (file)
--- a/src/BRepLib/BRepLib_MakeWire.cxx
+++ b/src/BRepLib/BRepLib_MakeWire.cxx
@@ -396,7 +396,7 @@ void  BRepLib_MakeWire::Add(const TopoDS_Edge& E)
 //purpose  : 
 //=======================================================================
 
-const TopoDS_Wire&  BRepLib_MakeWire::Wire()const 
+const TopoDS_Wire&  BRepLib_MakeWire::Wire()
 {
   return TopoDS::Wire(Shape());
 }
@@ -429,7 +429,7 @@ const TopoDS_Vertex&  BRepLib_MakeWire::Vertex()const
 //purpose  : 
 //=======================================================================
 
-BRepLib_MakeWire::operator TopoDS_Wire() const
+BRepLib_MakeWire::operator TopoDS_Wire()
 {
   return Wire();
 }

diff --git a/src/BRepLib/BRepLib_MakeWire.hxx b/src/BRepLib/BRepLib_MakeWire.hxx
index e46a760f31bfe15622ec3bff3b3c5eb0b840b136..11c58fc614f16f52564cf97536bcdc137e2a56df 100644 (file)
--- a/src/BRepLib/BRepLib_MakeWire.hxx
+++ b/src/BRepLib/BRepLib_MakeWire.hxx
@@ -117,8 +117,8 @@ public:
   Standard_EXPORT BRepLib_WireError Error() const;
   
   //! Returns the new wire.
-  Standard_EXPORT const TopoDS_Wire& Wire() const;
-Standard_EXPORT operator TopoDS_Wire() const;
+  Standard_EXPORT const TopoDS_Wire& Wire();
+  Standard_EXPORT operator TopoDS_Wire();
   
   //! Returns the last edge added to the wire.
   Standard_EXPORT const TopoDS_Edge& Edge() const;

diff --git a/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.cxx b/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.cxx
index 529d26caf9b001c6b9302af0f8a1d293dac237a9..d7d3a48e626088b7c55e8fe3a094bef585be0d8c 100644 (file)
--- a/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.cxx
+++ b/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.cxx
@@ -1528,7 +1528,7 @@ void QANewBRepNaming_BooleanOperationFeat::LoadSymmetricalEdges (BRepAlgoAPI_Boo
 //function : ISWRCase2
 //purpose  : 
 //=======================================================================
-Standard_Boolean QANewBRepNaming_BooleanOperationFeat::IsWRCase2(const BRepAlgoAPI_BooleanOperation& MS) {
+Standard_Boolean QANewBRepNaming_BooleanOperationFeat::IsWRCase2(BRepAlgoAPI_BooleanOperation& MS) {
   const TopoDS_Shape& Result = MS.Shape();
   const TopAbs_ShapeEnum& ResType = ShapeType(Result);
   if(ResType  == TopAbs_COMPOUND || ResType >= TopAbs_FACE) return Standard_False;

diff --git a/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.hxx b/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.hxx
index cab2154265df90ff77fbbbbae7d94e1cbf505d99..114ea0c497b3dda4f3335dad69eeb8243e37ccaa 100644 (file)
--- a/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.hxx
+++ b/src/QANewBRepNaming/QANewBRepNaming_BooleanOperationFeat.hxx
@@ -73,7 +73,7 @@ public:
   Standard_EXPORT static Standard_Boolean IsWRCase (const BRepAlgoAPI_BooleanOperation& theMS);
   
   //! Returns true if workaround case identified
-  Standard_EXPORT static Standard_Boolean IsWRCase2 (const BRepAlgoAPI_BooleanOperation& theMS);
+  Standard_EXPORT static Standard_Boolean IsWRCase2 (BRepAlgoAPI_BooleanOperation& MS);