0026936: Drawbacks of inlining in new type system in OCCT 7.0 -- automatic

Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro (upgrade -rtti)
2025-08-09 13:22:24 +03:00 · 2015-12-04 14:15:06 +03:00
parent f5f4ebd07b
commit 92efcf78a6
4556 changed files with 7149 additions and 2882 deletions
--- a/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPoints::Graphic3d_ArrayOfPoints (const Standard_Integer theMaxVertexs,
                                                  const Standard_Boolean theHasVColors,
                                                  const Standard_Boolean theHasVNormals)
--- a/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
@@ -43,7 +43,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPolygons.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPolygons::Graphic3d_ArrayOfPolygons (const Standard_Integer theMaxVertexs,
                                                      const Standard_Integer theMaxBounds,
                                                      const Standard_Integer theMaxEdges,
--- a/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
@@ -121,7 +121,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPolylines::Graphic3d_ArrayOfPolylines (const Standard_Integer theMaxVertexs,
                                                        const Standard_Integer theMaxBounds,
                                                        const Standard_Integer theMaxEdges,
--- a/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
@@ -110,7 +110,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
@@ -29,6 +29,8 @@

 #include <stdio.h>
 #include <stdlib.h>
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPrimitives,MMgt_TShared)
+
 Graphic3d_ArrayOfPrimitives::Graphic3d_ArrayOfPrimitives (const Graphic3d_TypeOfPrimitiveArray theType,
                                                          const Standard_Integer               theMaxVertexs,
                                                          const Standard_Integer               theMaxBounds,
--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
@@ -333,7 +333,7 @@ Standard_Integer AddVertex (const Graphic3d_Vec3& theVertex);
 friend class Graphic3d_Group;


-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPrimitives,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPrimitives,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfQuadrangleStrips.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfQuadrangleStrips::Graphic3d_ArrayOfQuadrangleStrips (const Standard_Integer theMaxVertexs,
                                                                      const Standard_Integer theMaxStrips,
                                                                      const Standard_Boolean theHasVNormals,
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
@@ -63,7 +63,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx
@@ -17,6 +17,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfQuadrangles::Graphic3d_ArrayOfQuadrangles (const Standard_Integer theMaxVertexs,
                                                            const Standard_Integer theMaxEdges,
                                                            const Standard_Boolean theHasVNormals,
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
@@ -81,7 +81,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfSegments::Graphic3d_ArrayOfSegments (const Standard_Integer theMaxVertexs,
                                                      const Standard_Integer theMaxEdges,
                                                      const Standard_Boolean theHasVColors)
--- a/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
@@ -67,7 +67,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangleFans.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangleFans::Graphic3d_ArrayOfTriangleFans (const Standard_Integer theMaxVertexs,
                                                              const Standard_Integer theMaxFans,
                                                              const Standard_Boolean theHasVNormals,
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
@@ -63,7 +63,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangleStrips.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangleStrips::Graphic3d_ArrayOfTriangleStrips (const Standard_Integer theMaxVertexs,
                                                                  const Standard_Integer theMaxStrips,
                                                                  const Standard_Boolean theHasVNormals,
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
@@ -82,7 +82,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangles::Graphic3d_ArrayOfTriangles (const Standard_Integer theMaxVertexs,
                                                        const Standard_Integer theMaxEdges,
                                                        const Standard_Boolean theHasVNormals,
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
@@ -78,7 +78,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)

 protected:

--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
@@ -32,6 +32,8 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)
+
 Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d ():
 DistinguishModeActive (Standard_False), EdgeModeActive (Standard_False), BackFaceRemovalActive (Standard_False),  MyTextureMapState(Standard_False), MyFrontMaterial (), MyBackMaterial ()
 {
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx
@@ -171,7 +171,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)

 protected:

--- a/src/Graphic3d/Graphic3d_AspectLine3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectLine3d.cxx
@@ -30,6 +30,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectLine3d,Aspect_AspectLine)
+
 //-Aliases
 //-Global data definitions
 //-Constructors
--- a/src/Graphic3d/Graphic3d_AspectLine3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectLine3d.hxx
@@ -63,7 +63,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_AspectLine3d,Aspect_AspectLine)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectLine3d,Aspect_AspectLine)

 protected:

--- a/src/Graphic3d/Graphic3d_AspectMarker3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectMarker3d.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfByte.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectMarker3d,Aspect_AspectMarker)
+
 // =======================================================================
 // function : Graphic3d_AspectMarker3d
 // purpose  :
--- a/src/Graphic3d/Graphic3d_AspectMarker3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectMarker3d.hxx
@@ -81,7 +81,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_AspectMarker3d,Aspect_AspectMarker)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectMarker3d,Aspect_AspectMarker)

 protected:

--- a/src/Graphic3d/Graphic3d_AspectText3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.cxx
@@ -35,6 +35,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectText3d,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //  -- la font utilisee
--- a/src/Graphic3d/Graphic3d_AspectText3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.hxx
@@ -143,7 +143,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_AspectText3d,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectText3d,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_BoundBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_BoundBuffer.hxx
@@ -65,7 +65,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_BoundBuffer, NCollection_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_BoundBuffer,NCollection_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_Buffer.hxx
+++ b/src/Graphic3d/Graphic3d_Buffer.hxx
@@ -203,7 +203,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_Buffer, NCollection_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_Buffer,NCollection_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_CStructure.cxx
+++ b/src/Graphic3d/Graphic3d_CStructure.cxx
@@ -19,6 +19,8 @@
 #include <Graphic3d_TransModeFlags.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient)
+
 //=============================================================================
 //function : Graphic3d_CStructure
 //purpose  :
--- a/src/Graphic3d/Graphic3d_CStructure.hxx
+++ b/src/Graphic3d/Graphic3d_CStructure.hxx
@@ -160,7 +160,7 @@ protected:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_CStructure, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_CView.cxx
+++ b/src/Graphic3d/Graphic3d_CView.cxx
@@ -15,6 +15,8 @@
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 #include <Graphic3d_StructureManager.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CView,Graphic3d_DataStructureManager)
+
 //=======================================================================
 //function : Constructor
 //purpose  :
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -570,7 +570,7 @@ protected:

 private:

-  DEFINE_STANDARD_RTTI (Graphic3d_CView, Graphic3d_DataStructureManager)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_CView,Graphic3d_DataStructureManager)
 };

 #endif // _Graphic3d_CView_HeaderFile
--- a/src/Graphic3d/Graphic3d_Camera.cxx
+++ b/src/Graphic3d/Graphic3d_Camera.cxx
@@ -26,6 +26,8 @@
 #include <NCollection_Sequence.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient)
+
 namespace
 {
  // (degrees -> radians) * 0.5
--- a/src/Graphic3d/Graphic3d_Camera.hxx
+++ b/src/Graphic3d/Graphic3d_Camera.hxx
@@ -637,7 +637,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_Camera, Standard_Transient);
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient);
 };

 DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient)
--- a/src/Graphic3d/Graphic3d_ClipPlane.cxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Atomic.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient)
+
 namespace
 {
  static volatile Standard_Integer THE_CLIP_PLANE_COUNTER = 0;
--- a/src/Graphic3d/Graphic3d_ClipPlane.hxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx
@@ -218,7 +218,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_ClipPlane, Standard_Transient);
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient);
 };

 DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
--- a/src/Graphic3d/Graphic3d_DataStructureManager.cxx
+++ b/src/Graphic3d/Graphic3d_DataStructureManager.cxx
@@ -25,6 +25,8 @@
 #include <Graphic3d_DataStructureManager.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //-Constructors
--- a/src/Graphic3d/Graphic3d_DataStructureManager.hxx
+++ b/src/Graphic3d/Graphic3d_DataStructureManager.hxx
@@ -44,7 +44,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_DataStructureManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_GraphicDriver.cxx
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.cxx
@@ -16,6 +16,8 @@

 #include <Graphic3d_GraphicDriver.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_GraphicDriver,MMgt_TShared)
+
 // =======================================================================
 // function : Graphic3d_GraphicDriver
 // purpose  :
--- a/src/Graphic3d/Graphic3d_GraphicDriver.hxx
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.hxx
@@ -139,7 +139,7 @@ public:
  
  Standard_EXPORT void ResetDeviceLostFlag();

-  DEFINE_STANDARD_RTTI(Graphic3d_GraphicDriver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_GraphicDriver,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_Group.cxx
+++ b/src/Graphic3d/Graphic3d_Group.cxx
@@ -39,6 +39,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
+
 #define MyContainsFacet myCBitFields.bool2

 // =======================================================================
--- a/src/Graphic3d/Graphic3d_Group.hxx
+++ b/src/Graphic3d/Graphic3d_Group.hxx
@@ -298,7 +298,7 @@ public:
 friend class Graphic3d_Structure;


-  DEFINE_STANDARD_RTTI(Graphic3d_Group,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_IndexBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_IndexBuffer.hxx
@@ -72,7 +72,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_IndexBuffer, Graphic3d_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_IndexBuffer,Graphic3d_Buffer) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_MarkerImage.cxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Atomic.hxx>
 #include <TColStd_HArray1OfByte.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_MarkerImage,Standard_Transient)
+
 namespace
 {
  static volatile Standard_Integer THE_MARKER_IMAGE_COUNTER = 0;
--- a/src/Graphic3d/Graphic3d_MarkerImage.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx
@@ -78,7 +78,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_MarkerImage, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_MarkerImage,Standard_Transient) // Type definition

 };

--- a/src/Graphic3d/Graphic3d_ShaderObject.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.cxx
@@ -19,6 +19,8 @@
 #include <Graphic3d_ShaderObject.hxx>
 #include <Graphic3d_GraphicDriver.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderObject,Standard_Transient)
+
 namespace
 {
  static volatile Standard_Integer THE_SHADER_OBJECT_COUNTER = 0;
--- a/src/Graphic3d/Graphic3d_ShaderObject.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.hxx
@@ -60,7 +60,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderObject, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderObject,Standard_Transient)

 protected:

--- a/src/Graphic3d/Graphic3d_ShaderProgram.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.cxx
@@ -24,6 +24,8 @@
 #include <OSD_File.hxx>
 #include <OSD_Path.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderProgram,Standard_Transient)
+
 namespace
 {
  static volatile Standard_Integer THE_PROGRAM_OBJECT_COUNTER = 0;
--- a/src/Graphic3d/Graphic3d_ShaderProgram.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.hxx
@@ -101,7 +101,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderProgram, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderProgram,Standard_Transient)

 private:

--- a/src/Graphic3d/Graphic3d_ShaderVariable.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.cxx
@@ -18,6 +18,8 @@
 #include <Graphic3d_ShaderVariable.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderVariable,Standard_Transient)
+
 // Specific instantiations of struct templates to avoid compilation warnings
 template struct Graphic3d_UniformValue<Standard_Integer>;
 template struct Graphic3d_UniformValue<Standard_ShortReal>;
--- a/src/Graphic3d/Graphic3d_ShaderVariable.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.hxx
@@ -144,7 +144,7 @@ public:

 public:

-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderVariable, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderVariable,Standard_Transient)

 protected:

--- a/src/Graphic3d/Graphic3d_Structure.cxx
+++ b/src/Graphic3d/Graphic3d_Structure.cxx
@@ -40,6 +40,8 @@
 #include <TColStd_Array2OfReal.hxx>

 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure,MMgt_TShared)
+
 //=============================================================================
 //function : Graphic3d_Structure
 //purpose  :
--- a/src/Graphic3d/Graphic3d_Structure.hxx
+++ b/src/Graphic3d/Graphic3d_Structure.hxx
@@ -487,7 +487,7 @@ public:
 friend class Graphic3d_Group;


-  DEFINE_STANDARD_RTTI(Graphic3d_Structure,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Structure,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_StructureManager.cxx
+++ b/src/Graphic3d/Graphic3d_StructureManager.cxx
@@ -34,12 +34,15 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_StructureManager,MMgt_TShared)
+
 static Standard_Boolean Initialisation = Standard_True;
 static int StructureManager_ArrayId[StructureManager_MAX];
 static Standard_Integer StructureManager_CurrentId = 0;

 #include "Graphic3d_Structure.pxx"
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
+#include <Graphic3d_CView.hxx>

 Graphic3d_StructureManager::Graphic3d_StructureManager (const Handle(Graphic3d_GraphicDriver)& theDriver)
 : myViewGenId (0, 31)
--- a/src/Graphic3d/Graphic3d_StructureManager.hxx
+++ b/src/Graphic3d/Graphic3d_StructureManager.hxx
@@ -232,7 +232,7 @@ public:

  friend class Graphic3d_Structure;

-  DEFINE_STANDARD_RTTI(Graphic3d_StructureManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_StructureManager,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture1D.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1D,Graphic3d_TextureMap)
+
 static const char *NameOfTexture_to_FileName[] =
 {
  "1d_elevation.rgb"
--- a/src/Graphic3d/Graphic3d_Texture1D.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1D.hxx
@@ -55,7 +55,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1D,Graphic3d_TextureMap)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1D,Graphic3d_TextureMap)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)
+
 // =======================================================================
 // function : Graphic3d_Texture1Dmanual
 // purpose  :
--- a/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx
@@ -49,7 +49,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)
+
 // =======================================================================
 // function : Graphic3d_Texture1Dsegment
 // purpose  :
--- a/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx
@@ -60,7 +60,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture2D.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2D,Graphic3d_TextureMap)
+
 static const char *NameOfTexture_to_FileName[] =
 {
  "2d_MatraDatavision.rgb",
--- a/src/Graphic3d/Graphic3d_Texture2D.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2D.hxx
@@ -55,7 +55,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2D,Graphic3d_TextureMap)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2D,Graphic3d_TextureMap)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)
+
 // =======================================================================
 // function : Graphic3d_Texture2Dmanual
 // purpose  :
--- a/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx
@@ -50,7 +50,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)

 protected:

--- a/src/Graphic3d/Graphic3d_Texture2Dplane.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dplane.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)
+
 // =======================================================================
 // function : Graphic3d_Texture2Dplane
 // purpose  :
--- a/src/Graphic3d/Graphic3d_Texture2Dplane.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dplane.hxx
@@ -121,7 +121,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)

 protected:

--- a/src/Graphic3d/Graphic3d_TextureEnv.cxx
+++ b/src/Graphic3d/Graphic3d_TextureEnv.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureEnv,Graphic3d_TextureRoot)
+
 static const char *NameOfTexture_to_FileName[] =
 {
  "env_clouds.rgb",
--- a/src/Graphic3d/Graphic3d_TextureEnv.hxx
+++ b/src/Graphic3d/Graphic3d_TextureEnv.hxx
@@ -63,7 +63,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_TextureEnv,Graphic3d_TextureRoot)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureEnv,Graphic3d_TextureRoot)

 protected:

--- a/src/Graphic3d/Graphic3d_TextureMap.cxx
+++ b/src/Graphic3d/Graphic3d_TextureMap.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureMap,Graphic3d_TextureRoot)
+
 // =======================================================================
 // function : Graphic3d_TextureMap
 // purpose  :
--- a/src/Graphic3d/Graphic3d_TextureMap.hxx
+++ b/src/Graphic3d/Graphic3d_TextureMap.hxx
@@ -88,7 +88,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_TextureMap,Graphic3d_TextureRoot)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureMap,Graphic3d_TextureRoot)

 protected:

--- a/src/Graphic3d/Graphic3d_TextureParams.cxx
+++ b/src/Graphic3d/Graphic3d_TextureParams.cxx
@@ -15,6 +15,8 @@
 #include <Graphic3d_TextureParams.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureParams,Standard_Transient)
+
 // =======================================================================
 // function : Graphic3d_TextureParams
 // purpose  :
--- a/src/Graphic3d/Graphic3d_TextureParams.hxx
+++ b/src/Graphic3d/Graphic3d_TextureParams.hxx
@@ -110,7 +110,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_TextureParams,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureParams,Standard_Transient)

 protected:

--- a/src/Graphic3d/Graphic3d_TextureRoot.cxx
+++ b/src/Graphic3d/Graphic3d_TextureRoot.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureRoot,MMgt_TShared)
+
 namespace
 {
  static volatile Standard_Integer THE_TEXTURE_COUNTER = 0;
--- a/src/Graphic3d/Graphic3d_TextureRoot.hxx
+++ b/src/Graphic3d/Graphic3d_TextureRoot.hxx
@@ -96,7 +96,7 @@ public:



-  DEFINE_STANDARD_RTTI(Graphic3d_TextureRoot,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureRoot,MMgt_TShared)

 protected:

--- a/src/Graphic3d/Graphic3d_ViewAffinity.cxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.cxx
@@ -16,3 +16,5 @@
 #include <Graphic3d_ViewAffinity.hxx>


+
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient)
--- a/src/Graphic3d/Graphic3d_ViewAffinity.hxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.hxx
@@ -65,7 +65,7 @@ private:

 public:

-  DEFINE_STANDARD_RTTI(Graphic3d_ViewAffinity, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient)

 };