0024947: Redesign OCCT legacy type system -- automatic

Automatic upgrade with command "occt_upgdare . -rtti"
2025-04-03 17:56:21 +03:00 · 2015-07-11 11:06:11 +03:00 · 2015-07-11 11:06:11 +03:00 · ec357c5cbb
commit ec357c5cbb
parent 69ff08ff28
816 changed files with 1280 additions and 690 deletions
--- a/src/AIS/AIS.cxx
+++ b/src/AIS/AIS.cxx
@ -77,6 +77,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopoDS.hxx>
+#include <Geom_Surface.hxx>

 const Standard_Real SquareTolerance = Precision::SquareConfusion();

--- a/src/AIS/AIS_AngleDimension.cxx
+++ b/src/AIS/AIS_AngleDimension.cxx
@ -49,9 +49,9 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_ProgramError.hxx>
 #include <UnitsAPI.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Plane.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_AngleDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_AngleDimension.hxx
+++ b/src/AIS/AIS_AngleDimension.hxx
@ -28,7 +28,7 @@
 #include <Prs3d_Presentation.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@ -209,7 +209,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (AIS_AngleDimension)
+  DEFINE_STANDARD_RTTI (AIS_AngleDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@ -41,11 +41,8 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_ColoredDrawer, Prs3d_Drawer)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredDrawer, Prs3d_Drawer)

-IMPLEMENT_STANDARD_HANDLE (AIS_ColoredShape, AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredShape, AIS_Shape)
+

 //=======================================================================
 //function : AIS_ColoredShape
--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@ -54,7 +54,7 @@ public:  //! @name list of overridden properties
  Standard_Boolean myHasOwnWidth;

 public:
-  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer);
+  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer, Prs3d_Drawer);

 };

@ -175,7 +175,7 @@ protected:

 public:

-  DEFINE_STANDARD_RTTI(AIS_ColoredShape);
+  DEFINE_STANDARD_RTTI(AIS_ColoredShape, AIS_Shape);

 };

--- a/src/AIS/AIS_DiameterDimension.cxx
+++ b/src/AIS/AIS_DiameterDimension.cxx
@ -25,8 +25,6 @@
 #include <gce_MakeDir.hxx>
 #include <Standard_ProgramError.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_DiameterDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_DiameterDimension.hxx
+++ b/src/AIS/AIS_DiameterDimension.hxx
@ -22,7 +22,7 @@
 #include <gp_Circ.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 DEFINE_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension)

@ -129,7 +129,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_DiameterDimension)
+  DEFINE_STANDARD_RTTI(AIS_DiameterDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_Dimension.cxx
+++ b/src/AIS/AIS_Dimension.cxx
@ -73,8 +73,6 @@
 #include <UnitsAPI.hxx>
 #include <UnitsAPI_SystemUnits.hxx>

-IMPLEMENT_STANDARD_HANDLE(AIS_Dimension, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension, AIS_InteractiveObject)

 namespace
 {
--- a/src/AIS/AIS_Dimension.hxx
+++ b/src/AIS/AIS_Dimension.hxx
@ -377,7 +377,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_Dimension)
+  DEFINE_STANDARD_RTTI(AIS_Dimension, AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@ -51,6 +51,8 @@
 #include <OSD_Environment.hxx>

 #include <AIS_ListIteratorOfListOfInteractive.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <SelectMgr_EntityOwner.hxx>

 namespace
 {
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@ -43,6 +43,7 @@

 #include <AIS_MapOfInteractive.hxx>
 #include <AIS_MapIteratorOfMapOfInteractive.hxx>
+#include <AIS_InteractiveObject.hxx>

 //=======================================================================
 //function : MoveTo
--- a/src/AIS/AIS_LengthDimension.cxx
+++ b/src/AIS/AIS_LengthDimension.cxx
@ -34,8 +34,6 @@
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>

-IMPLEMENT_STANDARD_HANDLE(AIS_LengthDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension, AIS_Dimension)

 //=======================================================================
 //function : Constructor
--- a/src/AIS/AIS_LengthDimension.hxx
+++ b/src/AIS/AIS_LengthDimension.hxx
@ -29,7 +29,7 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TCollection_ExtendedString.hxx>
@ -200,7 +200,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(AIS_LengthDimension)
+  DEFINE_STANDARD_RTTI(AIS_LengthDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@ -38,6 +38,7 @@
 #include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 #include <Visual3d_View.hxx>
+#include <AIS_InteractiveObject.hxx>

 #include <stdio.h>

--- a/src/AIS/AIS_LocalContext_1.cxx
+++ b/src/AIS/AIS_LocalContext_1.cxx
@ -45,6 +45,8 @@
 #include <AIS_Selection.hxx>
 #include <Aspect_Grid.hxx>
 #include <AIS_Shape.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <SelectMgr_EntityOwner.hxx>

 static Standard_Integer GetHiMod(const Handle(AIS_InteractiveObject)& IO)
 {
--- a/src/AIS/AIS_MultipleConnectedInteractive.cxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx
@ -26,6 +26,7 @@
 #include <Select3D_SensitiveEntity.hxx>
 #include <TopLoc_Location.hxx>
 #include <NCollection_DataMap.hxx>
+#include <AIS_InteractiveObject.hxx>

 namespace
 {
--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@ -31,8 +31,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <StdPrs_WFDeflectionRestrictedFace.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_PointCloud, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_PointCloud, AIS_InteractiveObject)

 //==================================================
 // Function: AIS_PointCloud
--- a/src/AIS/AIS_PointCloud.hxx
+++ b/src/AIS/AIS_PointCloud.hxx
@ -22,7 +22,7 @@
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Quantity_HArray1OfColor.hxx>
 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Macro.hxx>
 #include <TColgp_HArray1OfDir.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
@ -121,7 +121,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(AIS_PointCloud)
+  DEFINE_STANDARD_RTTI(AIS_PointCloud, AIS_InteractiveObject)

 };

--- a/src/AIS/AIS_RadiusDimension.cxx
+++ b/src/AIS/AIS_RadiusDimension.cxx
@ -21,8 +21,6 @@
 #include <ElCLib.hxx>
 #include <gce_MakeDir.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_RadiusDimension, AIS_Dimension)
-IMPLEMENT_STANDARD_RTTIEXT (AIS_RadiusDimension, AIS_Dimension)

 namespace
 {
--- a/src/AIS/AIS_RadiusDimension.hxx
+++ b/src/AIS/AIS_RadiusDimension.hxx
@ -117,7 +117,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (AIS_RadiusDimension)
+  DEFINE_STANDARD_RTTI (AIS_RadiusDimension, AIS_Dimension)

 protected:

--- a/src/AIS/AIS_TextLabel.cxx
+++ b/src/AIS/AIS_TextLabel.cxx
@ -23,8 +23,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <SelectMgr_EntityOwner.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_TextLabel, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_TextLabel, AIS_InteractiveObject)

 //=======================================================================
 //function : AIS_TextLabel
--- a/src/AIS/AIS_TextLabel.hxx
+++ b/src/AIS/AIS_TextLabel.hxx
@ -85,7 +85,7 @@ protected:
 public:

  //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(AIS_TextLabel);
+  DEFINE_STANDARD_RTTI(AIS_TextLabel, AIS_InteractiveObject);

 };

--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@ -40,8 +40,6 @@
 #include <StdPrs_WFShape.hxx>
 #include <TopExp_Explorer.hxx>

-IMPLEMENT_STANDARD_HANDLE (AIS_TexturedShape, AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_TexturedShape, AIS_Shape)

 //=======================================================================
 //function : AIS_TexturedShape
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@ -20,7 +20,7 @@
 #include <gp_Pnt2d.hxx>
 #include <Graphic3d_NameOfTexture2D.hxx>
 #include <Image_PixMap.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Texture2Dmanual.hxx>
@ -206,7 +206,7 @@ protected: //! @name texture mapping properties

 public:

-  DEFINE_STANDARD_RTTI (AIS_TexturedShape)
+  DEFINE_STANDARD_RTTI (AIS_TexturedShape, AIS_Shape)

 };

--- a/src/AIS/AIS_Triangulation.cxx
+++ b/src/AIS/AIS_Triangulation.cxx
@ -13,7 +13,7 @@

 #include <AIS_Triangulation.hxx>
 #include <AIS_InteractiveObject.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Prs3d_Drawer.hxx>
@ -28,9 +28,6 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>


-IMPLEMENT_STANDARD_HANDLE(AIS_Triangulation, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Triangulation, AIS_InteractiveObject)
-
 AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation)
 {
  myTriangulation = Triangulation;
--- a/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
+++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
@ -15,6 +15,7 @@
 #include <Interface_TypedValue.hxx>

 #include <APIHeaderSection_MakeHeader.hxx>
+#include <StepData_StepModel.hxx>

 static Standard_Boolean IsTimeStamp
  (const Handle(TCollection_HAsciiString)& val)
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
@ -28,6 +28,8 @@
 #include <Precision.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array2OfPnt.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>


 //=======================================================================
--- a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx
@ -41,6 +41,7 @@
 #include <Convert_GridPolynomialToPoles.hxx>

 #include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>


 //=======================================================================
--- a/src/Aspect/Aspect_DisplayConnection.cxx
+++ b/src/Aspect/Aspect_DisplayConnection.cxx
@ -16,8 +16,6 @@
 #include <Aspect_DisplayConnectionDefinitionError.hxx>
 #include <OSD_Environment.hxx>

-IMPLEMENT_STANDARD_HANDLE (Aspect_DisplayConnection, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection, Standard_Transient)

 // =======================================================================
 // function : Aspect_DisplayConnection
--- a/src/Aspect/Aspect_DisplayConnection.hxx
+++ b/src/Aspect/Aspect_DisplayConnection.hxx
@ -76,7 +76,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Aspect_DisplayConnection) // Type definition
+  DEFINE_STANDARD_RTTI(Aspect_DisplayConnection, Standard_Transient) // Type definition

 };

--- a/src/BRepAdaptor/BRepAdaptor_Curve.cxx
+++ b/src/BRepAdaptor/BRepAdaptor_Curve.cxx
@ -22,6 +22,9 @@
 #include <Geom_Surface.hxx>
 #include <Geom2dAdaptor_HCurve.hxx>
 #include <GeomAdaptor_HSurface.hxx>
+#include <Adaptor3d_HCurveOnSurface.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>

 //=======================================================================
 //function : BRepAdaptor_Curve
--- a/src/BRepAdaptor/BRepAdaptor_Surface.cxx
+++ b/src/BRepAdaptor/BRepAdaptor_Surface.cxx
@ -19,6 +19,9 @@
 #include <BRepTools.hxx>
 #include <GeomAdaptor_HSurface.hxx>
 #include <GeomAdaptor_HCurve.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>

 //=======================================================================
 //function : BRepAdaptor_Surface
--- a/src/BRepAlgo/BRepAlgo.cxx
+++ b/src/BRepAlgo/BRepAlgo.cxx
@ -45,6 +45,7 @@
 #include <TopoDS.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
+#include <Geom_Curve.hxx>

 //Temporary
 #//include <DrawTrSurf.hxx>
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
@ -113,16 +113,14 @@ public:
  }

 public:
-  DEFINE_STANDARD_RTTI(BRepBuilderAPI_Copy_Modification)
+  DEFINE_STANDARD_RTTI(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)

 private: 
  Standard_Boolean myCopyGeom;
 };

 DEFINE_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
-IMPLEMENT_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)

-IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)

 //=======================================================================
 //function : BRepBuilderAPI_Copy
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
@ -32,8 +32,6 @@
 #include <TopoDS.hxx>
 #include <TopTools_MapOfShape.hxx>

-IMPLEMENT_STANDARD_HANDLE(BRepBuilderAPI_FastSewing, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_FastSewing, Standard_Transient)

 //=======================================================================
 //function : IntersetctionOfSets
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
@ -100,7 +100,7 @@ public:
  //! Returns list of statuses. Print message if theOS != 0
  Standard_EXPORT FS_VARStatuses GetStatuses(Standard_OStream* const theOS = 0);

-  DEFINE_STANDARD_RTTI(BRepBuilderAPI_FastSewing)
+  DEFINE_STANDARD_RTTI(BRepBuilderAPI_FastSewing, Standard_Transient)

 protected:
  class NodeInspector;
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cxx
@ -34,6 +34,7 @@
 #include <Geom_Hyperbola.hxx> 
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
+#include <Geom_Curve.hxx>



--- a/src/BRepCheck/BRepCheck_Edge.cxx
+++ b/src/BRepCheck/BRepCheck_Edge.cxx
@ -65,6 +65,7 @@

 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
+#include <Geom_Curve.hxx>

 //modified by NIZNHY-PKV Thu May 05 09:01:57 2011f
 static 
--- a/src/BRepCheck/BRepCheck_Solid.cxx
+++ b/src/BRepCheck/BRepCheck_Solid.cxx
@ -14,7 +14,7 @@

 #include <BRepCheck_Solid.ixx>
 //
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <MMgt_TShared.hxx>
 //
 #include <NCollection_Vector.hxx>
@ -63,13 +63,14 @@ class BRepCheck_HSC : public MMgt_TShared {
      return mySC;
    };
  //
-  DEFINE_STANDARD_RTTI(BRepCheck_HSC);
+  DEFINE_STANDARD_RTTI(BRepCheck_HSC, MMgt_TShared);

 protected:
  BRepClass3d_SolidClassifier mySC;
 };
-IMPLEMENT_STANDARD_HANDLE(BRepCheck_HSC, MMgt_TShared);
-IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_HSC, MMgt_TShared);
+
+
+
 //
 //=======================================================================
 //class    : BRepCheck_ToolSolid
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
@ -21,8 +21,6 @@
 #include <Poly_Triangulation.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepExtrema_TriangleSet, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepExtrema_TriangleSet, Standard_Transient)

 //=======================================================================
 //function : BRepExtrema_TriangleSet
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
@ -80,7 +80,7 @@ protected:

 public:

-  DEFINE_STANDARD_RTTI(BRepExtrema_TriangleSet)
+  DEFINE_STANDARD_RTTI(BRepExtrema_TriangleSet, Standard_Transient)

 };

--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@ -107,6 +107,7 @@
 #include <DrawTrSurf.hxx>
 #include <DrawTrSurf_Curve2d.hxx>
 #include <DBRep.hxx>
+#include <Geom_Curve.hxx>
 static Standard_Boolean AffichGeom  = Standard_False;
 static Standard_Boolean Affich2d    = Standard_False;
 static Standard_Boolean AffichEdge  = Standard_False;
--- a/src/BRepFill/BRepFill_Sweep.cxx
+++ b/src/BRepFill/BRepFill_Sweep.cxx
@ -118,6 +118,7 @@
 #include <Draw.hxx>
 #include <DrawTrSurf.hxx>
 #include <DBRep.hxx>
+#include <Geom_BoundedSurface.hxx>
 static Standard_Boolean Affich = 0;
 #endif

--- a/src/BRepFill/BRepFill_TrimEdgeTool.cxx
+++ b/src/BRepFill/BRepFill_TrimEdgeTool.cxx
@ -38,6 +38,7 @@
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
 #include <DBRep.hxx>
+#include <Geom2d_Point.hxx>
 static Standard_Boolean Affich       = Standard_False;
 static Standard_Boolean AffichInt    = Standard_False;
 static Standard_Integer intind       = 0;
--- a/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
+++ b/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
@ -51,6 +51,8 @@
 #include <math_NewtonMinimum.hxx>
 #include <math_PSO.hxx>
 #include <math_PSOParticlesPool.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>

 class BRepLib_CheckCurveOnSurface_TargetFunc;

--- a/src/BRepLib/BRepLib_FuseEdges.cxx
+++ b/src/BRepLib/BRepLib_FuseEdges.cxx
@ -75,6 +75,7 @@
 #include <Extrema_LocateExtPC.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomConvert.hxx>
+#include <Geom2d_BoundedCurve.hxx>

 //#ifdef OCCT_DEBUG
 //Standard_IMPORT Standard_Boolean TopOpeBRepBuild_GettraceFE();
--- a/src/BRepLib/BRepLib_MakeShell.cxx
+++ b/src/BRepLib/BRepLib_MakeShell.cxx
@ -37,6 +37,7 @@
 #include <BRep_Builder.hxx>

 #include <TopExp_Explorer.hxx>
+#include <Geom_Surface.hxx>


 //=======================================================================
--- a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx
+++ b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx
@ -47,7 +47,8 @@
 #include <Geom2d_Hyperbola.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <GCE2d_MakeArcOfCircle.hxx>
-#include <GCE2d_MakeSegment.hxx> 
+#include <GCE2d_MakeSegment.hxx>
+#include <Geom2d_BoundedCurve.hxx> 
 //
 //  Modified by Sergey KHROMOV - Thu Dec  5 10:38:14 2002 Begin
 static TopoDS_Edge MakeEdge(const Handle(Geom2d_Curve) &theCurve,
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
@ -24,8 +24,6 @@
 #include <BRepTools.hxx>
 #include <Standard_ErrorHandler.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_DataStructureOfDelaun, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DataStructureOfDelaun, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_DataStructureOfDelaun
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
@ -15,7 +15,7 @@
 #define _BRepMesh_DataStructureOfDelaun_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_VertexTool.hxx>
 #include <Standard_Transient.hxx>
 #include <BRepMesh_Triangle.hxx>
@ -260,7 +260,7 @@ public: //! @name Auxilary API
    clearDeletedNodes();
  }

-  DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun)
+  DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun, Standard_Transient)

 private: 

--- a/src/BRepMesh/BRepMesh_DiscretRoot.cxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.cxx
@ -15,8 +15,6 @@

 #include <BRepMesh_DiscretRoot.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_DiscretRoot, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DiscretRoot, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_DiscretRoot
--- a/src/BRepMesh/BRepMesh_DiscretRoot.hxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
@ -15,7 +15,7 @@
 #define _BRepMesh_DiscretRoot_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Transient.hxx>

@ -73,7 +73,7 @@ public:
  Standard_EXPORT virtual void Perform() = 0;


-  DEFINE_STANDARD_RTTI(BRepMesh_DiscretRoot)
+  DEFINE_STANDARD_RTTI(BRepMesh_DiscretRoot, Standard_Transient)

 protected:
  
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
@ -19,8 +19,6 @@
 #include <Poly_Triangulation.hxx>
 #include <BRepMesh_ShapeTool.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
@ -64,7 +64,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV);

-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor)
+  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)

 private:

--- a/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
@ -31,8 +31,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TColStd_Array1OfReal.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
@ -66,7 +66,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV);

-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator)
+  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)

 private:

--- a/src/BRepMesh/BRepMesh_FaceAttribute.cxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.cxx
@ -19,8 +19,6 @@
 #include <BRepMesh_Classifier.hxx>
 #include <BRepTools.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FaceAttribute, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FaceAttribute, Standard_Transient)

 //=======================================================================
 //function : Constructor
--- a/src/BRepMesh/BRepMesh_FaceAttribute.hxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.hxx
@ -16,7 +16,7 @@

 #include <Standard.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 #include <BRepMesh_Status.hxx>
 #include <BRepMesh.hxx>
@ -323,7 +323,7 @@ public: //! @name Auxiliary methods
  Standard_EXPORT gp_XY Scale(const gp_XY&           thePoint2d, 
                              const Standard_Boolean isToFaceBasis);

-  DEFINE_STANDARD_RTTI(BRepMesh_FaceAttribute)
+  DEFINE_STANDARD_RTTI(BRepMesh_FaceAttribute, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_FastDiscret.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.cxx
@ -75,8 +75,6 @@

 #define UVDEFLECTION 1.e-05

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FastDiscret, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscret, Standard_Transient)

 //=======================================================================
 //function : BRepMesh_FastDiscret
--- a/src/BRepMesh/BRepMesh_FastDiscret.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.hxx
@ -15,7 +15,7 @@
 #define _BRepMesh_FastDiscret_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_FastDiscret.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
@ -175,7 +175,7 @@ public:
    return myBoundaryPoints->Extent();
  }

-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscret)
+  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscret, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
@ -57,8 +57,6 @@

 #include <algorithm>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_FastDiscretFace, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscretFace, Standard_Transient)

 static Standard_Real FUN_CalcAverageDUV(TColStd_Array1OfReal& P, const Standard_Integer PLen)
 {
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
@ -15,7 +15,7 @@
 #define _BRepMesh_FastDiscretFace_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <BRepMesh_FastDiscretFace.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh.hxx>
@ -64,7 +64,7 @@ public:

  Standard_EXPORT void Perform(const Handle(BRepMesh_FaceAttribute)& theAttribute);

-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscretFace)
+  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscretFace, Standard_Transient)

 private:

--- a/src/BRepMesh/BRepMesh_IEdgeTool.cxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.cxx
@ -15,5 +15,4 @@

 #include <BRepMesh_IEdgeTool.hxx>

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_IEdgeTool, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IEdgeTool, Standard_Transient)
+
--- a/src/BRepMesh/BRepMesh_IEdgeTool.hxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.hxx
@ -38,7 +38,7 @@ public:
                     gp_Pnt&                thePoint,
                     gp_Pnt2d&              theUV) = 0;

-  DEFINE_STANDARD_RTTI(BRepMesh_IEdgeTool)
+  DEFINE_STANDARD_RTTI(BRepMesh_IEdgeTool, Standard_Transient)
 };

 DEFINE_STANDARD_HANDLE(BRepMesh_IEdgeTool, Standard_Transient)
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
@ -60,8 +60,6 @@ namespace
  static Standard_Boolean IS_IN_PARALLEL = Standard_False;
 };

-IMPLEMENT_STANDARD_HANDLE (BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)
-IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)

 //=======================================================================
 //function : Default constructor
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
@ -15,7 +15,7 @@
 #define _BRepMesh_IncrementalMesh_HeaderFile

 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>

 #include <BRepMesh_FastDiscret.hxx>
 #include <TopTools_MapOfShape.hxx>
@ -162,7 +162,7 @@ public: //! @name plugin API
  //! Discret() static method (thus applied only to Mesh Factories).
  Standard_EXPORT static void SetParallelDefault(const Standard_Boolean isInParallel);

-  DEFINE_STANDARD_RTTI(BRepMesh_IncrementalMesh)
+  DEFINE_STANDARD_RTTI(BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)

 protected:

--- a/src/BRepOffset/BRepOffset_Inter2d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter2d.cxx
@ -83,6 +83,11 @@

 #ifdef DRAW 
 #include <DBRep.hxx>
+#include <Geom2d_BoundedCurve.hxx>
+#include <Geom_BoundedSurface.hxx>
+#include <Geom_BoundedCurve.hxx>
+#include <BRep_CurveOnSurface.hxx>
+#include <Geom_Surface.hxx>
 Standard_Boolean Inter2dAffichInt2d;
 static Standard_Integer NbF2d = 0;
 static Standard_Integer NbE2d = 0;
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@ -144,6 +144,9 @@

 #ifdef DRAW
 #include <DBRep.hxx>
+#include <Geom2d_Conic.hxx>
+#include <Geom_ElementarySurface.hxx>
+#include <Geom_BoundedCurve.hxx>
 Standard_Boolean AffichInter  = Standard_False;
 static Standard_Integer NbNewEdges  = 1;
 static Standard_Integer NbFaces     = 1;
--- a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
@ -49,6 +49,7 @@
 #include <BRep_GCurve.hxx>
 #include <TopoDS_Wire.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
+#include <Geom2d_Curve.hxx>

 //=======================================================================
 //function : BRepOffsetAPI_DraftAngle
--- a/src/BRepPrim/BRepPrim_Revolution.cxx
+++ b/src/BRepPrim/BRepPrim_Revolution.cxx
@ -18,6 +18,7 @@

 #include <Precision.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
+#include <Geom_Curve.hxx>

 //=======================================================================
 //function : BRepPrim_Revolution
--- a/src/BRepSweep/BRepSweep_Rotation.cxx
+++ b/src/BRepSweep/BRepSweep_Rotation.cxx
@ -60,6 +60,8 @@

 #include <GeomAdaptor_HCurve.hxx>
 #include <Geom_TrimmedCurve.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>

 static Standard_Real ComputeTolerance(TopoDS_Edge& E,
 				      const TopoDS_Face& F,
--- a/src/BRepSweep/BRepSweep_Translation.cxx
+++ b/src/BRepSweep/BRepSweep_Translation.cxx
@ -48,6 +48,8 @@
 #include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_CurveRepresentation.hxx>
 #include <TopExp_Explorer.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>

 static void SetThePCurve(const BRep_Builder& B,
 			 TopoDS_Edge& E,
--- a/src/BRepToIGES/BRepToIGES_BRWire.cxx
+++ b/src/BRepToIGES/BRepToIGES_BRWire.cxx
@ -84,6 +84,7 @@
 #include <Geom_OffsetSurface.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
+#include <Geom_Line.hxx>


 //=============================================================================
--- a/src/BRepTools/BRepTools_GTrsfModification.cxx
+++ b/src/BRepTools/BRepTools_GTrsfModification.cxx
@ -34,6 +34,8 @@
 #include <gp.hxx>
 #include <GeomLib.hxx>
 #include <TopAbs.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_Curve.hxx>

 //=======================================================================
 //function : BRepTools_GTrsfModification
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
@ -61,6 +61,9 @@
 #include <BRep_TEdge.hxx>
 #include <BRep_GCurve.hxx>
 #include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom2d_Curve.hxx>

 static void GeomLib_ChangeUBounds(Handle(Geom_BSplineSurface)& aSurface,
                  const Standard_Real newU1,
--- a/src/BRepTools/BRepTools_ShapeSet.cxx
+++ b/src/BRepTools/BRepTools_ShapeSet.cxx
@ -55,6 +55,7 @@

 #include <Message_ProgressIndicator.hxx>
 #include <Message_ProgressSentry.hxx>
+#include <BRep_GCurve.hxx>

 #ifdef MacOS
 #define strcasecmp(p,q) strcmp(p,q)
--- a/src/BRepTools/BRepTools_TrsfModification.cxx
+++ b/src/BRepTools/BRepTools_TrsfModification.cxx
@ -31,6 +31,8 @@
 #include <TopoDS.hxx>
 #include <Precision.hxx>
 #include <GeomAdaptor_Surface.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_Curve.hxx>

 //=======================================================================
 //function : BRepTools_TrsfModification
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
@ -32,6 +32,7 @@
 #include <TColgp_Array2OfPnt.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
+#include <Adaptor2d_HCurve2d.hxx>

 static 
  void Analyse(const TColgp_Array2OfPnt& array2,
--- a/src/BSplCLib/BSplCLib_Cache.cxx
+++ b/src/BSplCLib/BSplCLib_Cache.cxx
@ -21,8 +21,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>

-IMPLEMENT_STANDARD_HANDLE(BSplCLib_Cache, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BSplCLib_Cache, Standard_Transient)

 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
 static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
--- a/src/BSplCLib/BSplCLib_Cache.hxx
+++ b/src/BSplCLib/BSplCLib_Cache.hxx
@ -16,7 +16,7 @@

 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>

 #include <Handle_TColStd_HArray1OfReal.hxx>
@ -144,7 +144,7 @@ public:
                                gp_Vec&        theTorsion) const;


-  DEFINE_STANDARD_RTTI(BSplCLib_Cache)
+  DEFINE_STANDARD_RTTI(BSplCLib_Cache, Standard_Transient)

 protected:
  //! Normalizes the parameter for periodical B-splines
--- a/src/BSplSLib/BSplSLib_Cache.cxx
+++ b/src/BSplSLib/BSplSLib_Cache.cxx
@ -21,8 +21,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>

-IMPLEMENT_STANDARD_HANDLE(BSplSLib_Cache, Standard_Transient)
-IMPLEMENT_STANDARD_RTTIEXT(BSplSLib_Cache, Standard_Transient)

 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
 static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
--- a/src/BSplSLib/BSplSLib_Cache.hxx
+++ b/src/BSplSLib/BSplSLib_Cache.hxx
@ -16,7 +16,7 @@

 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>

 #include <Handle_TColStd_HArray1OfReal.hxx>
@ -127,7 +127,7 @@ public:
                                gp_Vec&        theCurvatureUV) const;


-  DEFINE_STANDARD_RTTI(BSplSLib_Cache)
+  DEFINE_STANDARD_RTTI(BSplSLib_Cache, Standard_Transient)

 protected:
  //! Normalizes the parameter for periodical B-splines
--- a/src/BiTgte/BiTgte_Blend.cxx
+++ b/src/BiTgte/BiTgte_Blend.cxx
@ -2288,6 +2288,7 @@ void BiTgte_Blend::ComputeSurfaces()
 //purpose  : 
 //=======================================================================
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+#include <Geom_Curve.hxx>

 void BiTgte_Blend::ComputeShape() 
 {
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@ -27,6 +27,7 @@
 #include <TDF_Data.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Owner.hxx>
+#include <TDF_Attribute.hxx>

 #define SHAPESECTION_POS "SHAPE_SECTION_POS:"
 #define SIZEOFSHAPELABEL  18
--- a/src/BinMDF/BinMDF_ADriverTable.cxx
+++ b/src/BinMDF/BinMDF_ADriverTable.cxx
@ -18,6 +18,7 @@
 #include <BinMDF_StringIdMap.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <BinMDF_DataMapIteratorOfTypeADriverMap.hxx>
+#include <Standard_Type.hxx>

 //=======================================================================
 //function : BinMDF_ADriverTable
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
@ -41,7 +41,7 @@ class BinTObjDrivers_DocumentRetrievalDriver :

 public:
  // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentRetrievalDriver, BinLDrivers_DocumentRetrievalDriver)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
@ -41,7 +41,7 @@ class BinTObjDrivers_DocumentStorageDriver :

 public:
  // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentStorageDriver, BinLDrivers_DocumentStorageDriver)
 };

 // Definition of HANDLE object using Standard_DefineHandle.hxx
--- a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx
@ -24,8 +24,6 @@
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>

-IMPLEMENT_STANDARD_HANDLE(BinTObjDrivers_IntSparseArrayDriver,BinMDF_ADriver)
-IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_IntSparseArrayDriver,BinMDF_ADriver)

 //=======================================================================
 //function : BinTObjDrivers_IntSparseArrayDriver
--- a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx
@ -49,7 +49,7 @@ class BinTObjDrivers_IntSparseArrayDriver : public BinMDF_ADriver

 public:
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_IntSparseArrayDriver)
+  DEFINE_STANDARD_RTTI(BinTObjDrivers_IntSparseArrayDriver, BinMDF_ADriver)
 };

 // Define handle class
--- a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx
@ -26,8 +26,8 @@
 #include <TObj_Model.hxx>
 #include <TObj_Assistant.hxx>

-IMPLEMENT_STANDARD_HANDLE(BinTObjDrivers_ModelDriver,BinMDF_ADriver)
-IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ModelDriver,BinMDF_ADriver);
+
+

 //=======================================================================
 //function : BinTObjDrivers_ModelDriver
--- a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx
@ -54,7 +54,7 @@ class BinTObjDrivers_ModelDriver : public BinMDF_ADriver
  
 public:
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ModelDriver)
+  DEFINE_STANDARD_RTTI(BinTObjDrivers_ModelDriver, BinMDF_ADriver)
 };

 // Define handle class
--- a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx
@ -25,8 +25,8 @@
 #include <TObj_TObject.hxx>
 #include <TObj_Persistence.hxx>

-IMPLEMENT_STANDARD_HANDLE(BinTObjDrivers_ObjectDriver,BinMDF_ADriver)
-IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ObjectDriver,BinMDF_ADriver);
+
+

 //=======================================================================
 //function : BinTObjDrivers_ObjectDriver
--- a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx
@ -55,7 +55,7 @@ class BinTObjDrivers_ObjectDriver : public BinMDF_ADriver

 public:
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ObjectDriver)
+  DEFINE_STANDARD_RTTI(BinTObjDrivers_ObjectDriver, BinMDF_ADriver)
 };

 // Define handle class
--- a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx
@ -27,8 +27,6 @@
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Tool.hxx>

-IMPLEMENT_STANDARD_HANDLE(BinTObjDrivers_ReferenceDriver,BinMDF_ADriver)
-IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ReferenceDriver,BinMDF_ADriver)

 //=======================================================================
 //function : BinTObjDrivers_ReferenceDriver
--- a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx
@ -55,7 +55,7 @@ class BinTObjDrivers_ReferenceDriver : public BinMDF_ADriver

 public:
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ReferenceDriver)
+  DEFINE_STANDARD_RTTI(BinTObjDrivers_ReferenceDriver, BinMDF_ADriver)
 };

 // Define handle class
--- a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx
@ -22,8 +22,6 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <TObj_TXYZ.hxx>

-IMPLEMENT_STANDARD_HANDLE(BinTObjDrivers_XYZDriver,BinMDF_ADriver)
-IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_XYZDriver,BinMDF_ADriver)

 //=======================================================================
 //function : BinTObjDrivers_XYZDriver
--- a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx
@ -50,7 +50,7 @@ class BinTObjDrivers_XYZDriver : public BinMDF_ADriver

 public:
  // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_XYZDriver)
+  DEFINE_STANDARD_RTTI(BinTObjDrivers_XYZDriver, BinMDF_ADriver)
 };

 // Define handle class
--- a/src/BinTools/BinTools_Curve2dSet.cxx
+++ b/src/BinTools/BinTools_Curve2dSet.cxx
@ -38,6 +38,7 @@
 #include <Standard_ErrorHandler.hxx>

 #include <BinTools.hxx>
+#include <Geom2d_Curve.hxx>

 #define LINE      1
 #define CIRCLE    2
--- a/src/BinTools/BinTools_CurveSet.cxx
+++ b/src/BinTools/BinTools_CurveSet.cxx
@ -36,6 +36,7 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
+#include <Geom_Curve.hxx>

 #define LINE      1
 #define CIRCLE    2
--- a/src/BinTools/BinTools_ShapeSet.cxx
+++ b/src/BinTools/BinTools_ShapeSet.cxx
@ -46,6 +46,7 @@
 #include <BinTools_Curve2dSet.hxx>
 #include <BinTools_CurveSet.hxx>
 #include <BinTools_SurfaceSet.hxx>
+#include <BRep_CurveOnSurface.hxx>
 #include <string.h>
 //#define MDTV_DEB 1
 const char* Version_1  = "Open CASCADE Topology V1 (c)";
--- a/Show More
+++ b/Show More