Avoid recurrence in implicit instantiation of type descriptors

Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro
Correction in macro
2025-08-09 13:22:24 +03:00 · 2015-11-29 16:33:05 +03:00 · 2015-11-28 15:34:35 +03:00 · 2015-11-28 15:28:13 +03:00 · 2015-11-28 12:56:08 +03:00 · 2015-11-28 08:10:27 +03:00
4427 changed files with 6709 additions and 2305 deletions
--- a/adm/upgrade.tcl
+++ b/adm/upgrade.tcl
@@ -477,6 +477,77 @@ proc ConvertTColFwd {thePackagePath theHeaderExtensions} {
  }
 }

+# try to find source file corresponding to the specified header and either
+# inject macro IMPLEMENT_STANDARD_RTTIEXT in it, or check it already present,
+# and depending on this, return suffix to be used for corresponding macro
+# DEFINE_STANDARD_RTTI... (either inline or out-of-line variant)
+proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
+  # if current file is not a header (by extension), exit with "inline" variant
+  # (there is no need to bother with out-of-line instantiations for local class)
+  set ext [string range [file extension $hxxfile] 1 end]
+  if { [lsearch -exact [split $theSourceExtensions ,] $ext] >=0 } {
+    return "_INLINE"
+  }
+
+  # try to find source file with the same name but source-type extension 
+  # in the same folder
+  set filename [file rootname $hxxfile]
+  foreach ext [split $theSourceExtensions ,] {
+#    puts "Checking ${filename}.$ext"
+    if { ! [file readable ${filename}.$ext] } { continue }
+
+    # check the file content
+    set aFileContent [ReadFileToList ${filename}.$ext aFileRawContent aEOL]
+
+    # try to find existing macro IMPLEMENT_STANDARD_RTTIEXT and check that 
+    # it is consistent
+    foreach line $aFileContent {
+      if { [regexp {^\s*IMPLEMENT_STANDARD_RTTIEXT\s*\(\s*$class\s*,\s*([A-Za-z]+)\s*\)} $line res impl_base] } {
+        # implementation is in place, just report warning if second argument
+        # is different
+        if { $base != $impl_base } {
+          logwarn "Warning in ${filename}.$ext: second argument of macro"
+          logwarn "        IMPLEMENT_STANDARD_RTTIEXT($class,$impl_base)"
+          logwarn "        is not the same as detected base class, $base"
+        }
+        return "EXT"
+      }
+    }
+
+    # inject a new macro before the first non-empty, non-comment, and 
+    # non-preprocessor line
+    set aNewFileContent {}
+    set injected 0
+    set inc_found 0
+    foreach line $aFileContent {
+      if { ! $injected } {
+        # add macro before first non-empty line after #includes
+        if { [regexp {^\s*$} $line] } {
+        } elseif { [regexp {^\s*\#\s*include} $line] } {
+          set inc_found 1
+        } elseif { $inc_found } {
+          set injected 1
+          lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
+          if { ! [regexp "^IMPLEMENT_" $line] } {
+            lappend aNewFileContent ""
+          }
+        }
+      }
+      lappend aNewFileContent $line
+    }
+    if { ! $injected } {
+      lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
+    }
+    SaveListToFile ${filename}.$ext $aNewFileContent $aEOL
+
+    return "EXT"
+  }
+
+  logwarn "Warning in ${hxxfile}: cannot find corresponding source file,"
+  logwarn "           will use inline version of DEFINE_STANDARD_RTTI"
+  return "_INLINE"
+}
+
 # Parse source files and:
 #
 # - add second argument to macro DEFINE_STANDARD_RTTI specifying first base 
@@ -521,7 +592,7 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \

    # find all instances of DEFINE_STANDARD_RTTI with single or two arguments
    set index 0
-    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI\s*)\(\s*([A-Za-z_0-9,\s]+)\s*\)}
+    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI)\s*\(\s*([A-Za-z_0-9,\s]+)\s*\)}
    while { [regexp -start $index -indices -lineanchor $pattern_rtti \
                    $aProcessedFileContent location start clist] } {
      set index [lindex $location 1]
@@ -538,7 +609,12 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
              logwarn "macro DEFINE_STANDARD_RTTI is changed assuming it inherits $inherits($class), please check!"
            }
            set change_flag 1
-            ReplaceSubString aProcessedFileContent $location "${start}($class, $inherits($class))" index
+            # try to inject macro IMPLEMENT_STANDARD_RTTIEXT in the 
+            # corresponding source file (or check it already present),
+            # and depending on this, use either inline or out-of-line variant
+            set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $inherits($class) $theSourceExtensions]
+            ReplaceSubString aProcessedFileContent $location \
+                             "${start}${rtti_suffix}($class,$inherits($class))" index
          }
        } else {
          logwarn "Error in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file, cannot fix"
@@ -550,11 +626,16 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
          logwarn "Warning in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file"
        } elseif { $base != $inherits($class) } {
          logwarn "Warning in $aProcessedFile: Second argument in macro DEFINE_STANDARD_RTTI for class $class is $base while $class seems to inherit from $inherits($class)"
-          if { ! $theCheckMode && ! [info exists inherits($class,multiple)] } {
-            set change_flag 1
-            ReplaceSubString aProcessedFileContent $location "${start}($class, $inherits($class))" index
+          if { ! [info exists inherits($class,multiple)] } {
+            set base $inherits($class)
          }
        }
+        if { ! $theCheckMode } {
+          set change_flag 1
+          set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $base $theSourceExtensions]
+          ReplaceSubString aProcessedFileContent $location \
+                           "${start}${rtti_suffix}($class,$base)" index
+        }
      }
    }

@@ -578,8 +659,12 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
      set index 0
      set first_newline \n\n
      set pattern_implement {\\?\n\s*IMPLEMENT_(DOWNCAST|STANDARD_[A-Z_]+|HARRAY1|HARRAY2|HUBTREE|HEBTREE|HSEQUENCE)\s*\([A-Za-z0-9_ ,]*\)\s*;?}
-      while { [regexp -start $index -indices -lineanchor $pattern_implement $aProcessedFileContent location] } {
+      while { [regexp -start $index -indices -lineanchor $pattern_implement $aProcessedFileContent location macro] } {
        set index [lindex $location 1]
+        # macro IMPLEMENT_STANDARD_RTTIEXT is retained
+        if { [eval string range \$aProcessedFileContent $macro] == "STANDARD_RTTIEXT" } {
+          continue
+        }
        if { ! $theCheckMode } {
          set change_flag 1
          ReplaceSubString aProcessedFileContent $location $first_newline index
@@ -1081,10 +1166,11 @@ proc ReadFileToList {theFilePath theFileContent theFileEOL} {
    regsub -all {$aFileEOL} $aFileContent "\n" aFileContent
  }

-  set aList {}
-  foreach aLine [split $aFileContent "\n"] {
-    lappend aList [string trimright $aLine]
-  }
+  set aList [split $aFileContent "\n"]
+#  set aList {}
+#  foreach aLine [split $aFileContent "\n"] {
+#    lappend aList [string trimright $aLine]
+#  }

  return $aList
 }
@@ -1154,6 +1240,8 @@ proc SaveListToFile {theFilePath theData {theEOL "auto"}} {
  fconfigure $aFile -translation binary
  puts -nonewline $aFile [join $theData $anUsedEol]
  close $aFile
+
+  loginfo "File $theFilePath modified"
 }

 # collect all subdirs of theBaseDir
--- a/src/AIS/AIS_AngleDimension.cxx
+++ b/src/AIS/AIS_AngleDimension.cxx
@@ -53,6 +53,8 @@
 #include <Geom_Plane.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(AIS_AngleDimension,AIS_Dimension)
+
 namespace
 {
  static const TCollection_ExtendedString THE_EMPTY_LABEL_STRING;
--- a/src/AIS/AIS_AngleDimension.hxx
+++ b/src/AIS/AIS_AngleDimension.hxx
@@ -210,7 +210,7 @@ public:

 public:

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

 protected:

--- a/src/AIS/AIS_AttributeFilter.cxx
+++ b/src/AIS/AIS_AttributeFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)
+
 AIS_AttributeFilter::AIS_AttributeFilter():
 hasC(Standard_False),
 hasW(Standard_False){}
--- a/src/AIS/AIS_AttributeFilter.hxx
+++ b/src/AIS/AIS_AttributeFilter.hxx
@@ -101,7 +101,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_AttributeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)

 protected:

--- a/src/AIS/AIS_Axis.cxx
+++ b/src/AIS/AIS_Axis.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS.hxx>
 #include <UnitsAPI.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Axis
 //purpose  :
--- a/src/AIS/AIS_Axis.hxx
+++ b/src/AIS/AIS_Axis.hxx
@@ -133,7 +133,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Axis,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_BadEdgeFilter.cxx
+++ b/src/AIS/AIS_BadEdgeFilter.cxx
@@ -25,6 +25,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_BadEdgeFilter
 //purpose  : 
--- a/src/AIS/AIS_BadEdgeFilter.hxx
+++ b/src/AIS/AIS_BadEdgeFilter.hxx
@@ -61,7 +61,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_BadEdgeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)

 protected:

--- a/src/AIS/AIS_C0RegularityFilter.cxx
+++ b/src/AIS/AIS_C0RegularityFilter.cxx
@@ -28,6 +28,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_C0RegularityFilter
 //purpose  : 
--- a/src/AIS/AIS_C0RegularityFilter.hxx
+++ b/src/AIS/AIS_C0RegularityFilter.hxx
@@ -47,7 +47,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_C0RegularityFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)

 protected:

--- a/src/AIS/AIS_Chamf2dDimension.cxx
+++ b/src/AIS/AIS_Chamf2dDimension.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
--- a/src/AIS/AIS_Chamf2dDimension.hxx
+++ b/src/AIS/AIS_Chamf2dDimension.hxx
@@ -82,7 +82,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Chamf2dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)

 protected:

--- a/src/AIS/AIS_Chamf3dDimension.cxx
+++ b/src/AIS/AIS_Chamf3dDimension.cxx
@@ -49,6 +49,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
--- a/src/AIS/AIS_Chamf3dDimension.hxx
+++ b/src/AIS/AIS_Chamf3dDimension.hxx
@@ -81,7 +81,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Chamf3dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)

 protected:

--- a/src/AIS/AIS_Circle.cxx
+++ b/src/AIS/AIS_Circle.cxx
@@ -37,6 +37,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Circle
 //purpose  : 
--- a/src/AIS/AIS_Circle.hxx
+++ b/src/AIS/AIS_Circle.hxx
@@ -112,7 +112,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Circle,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_ColorScale.cxx
+++ b/src/AIS/AIS_ColorScale.cxx
@@ -39,6 +39,8 @@
 #include <V3d_View.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_ColorScale
 //purpose  :
--- a/src/AIS/AIS_ColorScale.hxx
+++ b/src/AIS/AIS_ColorScale.hxx
@@ -211,7 +211,7 @@ public:
  Standard_EXPORT void TextSize (const TCollection_ExtendedString& theText, const Standard_Integer theHeight, Standard_Integer& theWidth, Standard_Integer& theAscent, Standard_Integer& theDescent) const;


-  DEFINE_STANDARD_RTTI(AIS_ColorScale,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -44,6 +44,9 @@



+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape)
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer)
+
 //=======================================================================
 //function : AIS_ColoredShape
 //purpose  :
--- 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, Prs3d_Drawer);
+  DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer);

 };

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

 public:

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

 };

--- a/src/AIS/AIS_ConcentricRelation.cxx
+++ b/src/AIS/AIS_ConcentricRelation.cxx
@@ -41,6 +41,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
--- a/src/AIS/AIS_ConcentricRelation.hxx
+++ b/src/AIS/AIS_ConcentricRelation.hxx
@@ -68,7 +68,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_ConcentricRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_ConnectedInteractive.cxx
+++ b/src/AIS/AIS_ConnectedInteractive.cxx
@@ -44,6 +44,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_ConnectedInteractive
 //purpose  : 
--- a/src/AIS/AIS_ConnectedInteractive.hxx
+++ b/src/AIS/AIS_ConnectedInteractive.hxx
@@ -101,7 +101,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_ConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)

 protected:

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


+IMPLEMENT_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension)
+
 namespace
 {
  static const Standard_ExtCharacter THE_DIAMETER_SYMBOL (0x00D8);
--- a/src/AIS/AIS_DiameterDimension.hxx
+++ b/src/AIS/AIS_DiameterDimension.hxx
@@ -130,7 +130,7 @@ public:

 public:

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

 protected:

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


+IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension,AIS_InteractiveObject)
+
 namespace
 {
  // default text strings
--- a/src/AIS/AIS_Dimension.hxx
+++ b/src/AIS/AIS_Dimension.hxx
@@ -378,7 +378,7 @@ public:

 public:

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

 protected:

--- a/src/AIS/AIS_DimensionOwner.cxx
+++ b/src/AIS/AIS_DimensionOwner.cxx
@@ -24,6 +24,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)
+
 namespace
 {
  //=======================================================================
--- a/src/AIS/AIS_DimensionOwner.hxx
+++ b/src/AIS/AIS_DimensionOwner.hxx
@@ -71,7 +71,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_DimensionOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)

 protected:

--- a/src/AIS/AIS_EllipseRadiusDimension.cxx
+++ b/src/AIS/AIS_EllipseRadiusDimension.cxx
@@ -46,6 +46,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EllipseRadiusDimension
 //purpose  : 
--- a/src/AIS/AIS_EllipseRadiusDimension.hxx
+++ b/src/AIS/AIS_EllipseRadiusDimension.hxx
@@ -54,7 +54,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_EllipseRadiusDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)

 protected:

--- a/src/AIS/AIS_EqualDistanceRelation.cxx
+++ b/src/AIS/AIS_EqualDistanceRelation.cxx
@@ -48,6 +48,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EqualDistanceRelation
 //purpose  : 
--- a/src/AIS/AIS_EqualDistanceRelation.hxx
+++ b/src/AIS/AIS_EqualDistanceRelation.hxx
@@ -108,7 +108,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_EqualDistanceRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_EqualRadiusRelation.cxx
+++ b/src/AIS/AIS_EqualRadiusRelation.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EqualRadiusRelation
 //purpose  : 
--- a/src/AIS/AIS_EqualRadiusRelation.hxx
+++ b/src/AIS/AIS_EqualRadiusRelation.hxx
@@ -59,7 +59,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_EqualRadiusRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_ExclusionFilter.cxx
+++ b/src/AIS/AIS_ExclusionFilter.cxx
@@ -23,6 +23,8 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_ExclusionFilter
 //purpose  : Constructors
--- a/src/AIS/AIS_ExclusionFilter.hxx
+++ b/src/AIS/AIS_ExclusionFilter.hxx
@@ -93,7 +93,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_ExclusionFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)

 protected:

--- a/src/AIS/AIS_FixRelation.cxx
+++ b/src/AIS/AIS_FixRelation.cxx
@@ -57,6 +57,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
+
 static Standard_Boolean InDomain(const Standard_Real fpar,
 					const Standard_Real lpar,
 					const Standard_Real para) 
--- a/src/AIS/AIS_FixRelation.hxx
+++ b/src/AIS/AIS_FixRelation.hxx
@@ -101,7 +101,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_FixRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_GlobalStatus.cxx
+++ b/src/AIS/AIS_GlobalStatus.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_GlobalStatus,MMgt_TShared)
+
 AIS_GlobalStatus::AIS_GlobalStatus():
 myStatus(AIS_DS_None),
 myLayerIndex(0),
--- a/src/AIS/AIS_GlobalStatus.hxx
+++ b/src/AIS/AIS_GlobalStatus.hxx
@@ -93,7 +93,7 @@ public:



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

 protected:

--- a/src/AIS/AIS_IdenticRelation.cxx
+++ b/src/AIS/AIS_IdenticRelation.cxx
@@ -55,6 +55,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
+
 // jfa 15/10/2000
 static Standard_Real Modulo2PI(const Standard_Real ANGLE)
 {
--- a/src/AIS/AIS_IdenticRelation.hxx
+++ b/src/AIS/AIS_IdenticRelation.hxx
@@ -76,7 +76,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_IdenticRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -62,6 +62,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveContext,MMgt_TShared)
+
 //#include <AIS_DataMapIteratorOfDataMapOfInteractiveInteger.hxx>
 namespace
 {
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -1566,7 +1566,7 @@ public:
 friend class AIS_LocalContext;


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

 protected:

--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -44,6 +44,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
+
 //=======================================================================
 //function : AIS_InteractiveObject
 //purpose  : 
--- a/src/AIS/AIS_InteractiveObject.hxx
+++ b/src/AIS/AIS_InteractiveObject.hxx
@@ -460,7 +460,7 @@ public:
 friend class AIS_InteractiveContext;


-  DEFINE_STANDARD_RTTI(AIS_InteractiveObject,SelectMgr_SelectableObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)

 protected:

--- a/src/AIS/AIS_LengthDimension.cxx
+++ b/src/AIS/AIS_LengthDimension.cxx
@@ -36,6 +36,8 @@
 #include <TopExp_Explorer.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
+
 //=======================================================================
 //function : Constructor
 //purpose  : Dimension between two faces
--- a/src/AIS/AIS_LengthDimension.hxx
+++ b/src/AIS/AIS_LengthDimension.hxx
@@ -196,7 +196,7 @@ public:

 public:

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

 protected:

--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -39,6 +39,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
+
 //==================================================================
 // function: FindLimits
 // purpose:
--- a/src/AIS/AIS_Line.hxx
+++ b/src/AIS/AIS_Line.hxx
@@ -103,7 +103,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Line,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@@ -49,6 +49,8 @@
 #include <V3d_Viewer.hxx>

 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalContext,MMgt_TShared)
+
 static TCollection_AsciiString AIS_Local_SelName(const Standard_Address address,
                                                 const Standard_Integer anIndex)
 {
--- a/src/AIS/AIS_LocalContext.hxx
+++ b/src/AIS/AIS_LocalContext.hxx
@@ -359,7 +359,7 @@ public:



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

 protected:

--- a/src/AIS/AIS_LocalStatus.cxx
+++ b/src/AIS/AIS_LocalStatus.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalStatus,MMgt_TShared)
+
 AIS_LocalStatus::AIS_LocalStatus(const Standard_Boolean IsTemp,
 				 const Standard_Boolean Decomp,
 				 const Standard_Integer DMode,
--- a/src/AIS/AIS_LocalStatus.hxx
+++ b/src/AIS/AIS_LocalStatus.hxx
@@ -89,7 +89,7 @@ public:



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

 protected:

--- a/src/AIS/AIS_MaxRadiusDimension.cxx
+++ b/src/AIS/AIS_MaxRadiusDimension.cxx
@@ -58,6 +58,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
+
 //=======================================================================
 //function : AIS_MaxRadiusDimension
 //purpose  : 
--- a/src/AIS/AIS_MaxRadiusDimension.hxx
+++ b/src/AIS/AIS_MaxRadiusDimension.hxx
@@ -69,7 +69,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)

 protected:

--- a/src/AIS/AIS_MidPointRelation.cxx
+++ b/src/AIS/AIS_MidPointRelation.cxx
@@ -53,6 +53,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_MidPointRelation
 //purpose  : 
--- a/src/AIS/AIS_MidPointRelation.hxx
+++ b/src/AIS/AIS_MidPointRelation.hxx
@@ -67,7 +67,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_MidPointRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_MinRadiusDimension.cxx
+++ b/src/AIS/AIS_MinRadiusDimension.cxx
@@ -58,6 +58,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
+
 //=======================================================================
 //function : AIS_MinRadiusDimension
 //purpose  : 
--- a/src/AIS/AIS_MinRadiusDimension.hxx
+++ b/src/AIS/AIS_MinRadiusDimension.hxx
@@ -68,7 +68,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)

 protected:

--- a/src/AIS/AIS_MultipleConnectedInteractive.cxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
+
 namespace
 {
  //! SelectMgr_AssemblyEntityOwner replaces original owners in sensitive entities
--- a/src/AIS/AIS_MultipleConnectedInteractive.hxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.hxx
@@ -100,7 +100,7 @@ public:
  Standard_EXPORT virtual Handle(SelectMgr_EntityOwner) GlobalSelOwner() const Standard_OVERRIDE;


-  DEFINE_STANDARD_RTTI(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_OffsetDimension.cxx
+++ b/src/AIS/AIS_OffsetDimension.cxx
@@ -56,6 +56,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)
+
 //=======================================================================
 //function : AIS_OffsetDimension
 //purpose  : 
--- a/src/AIS/AIS_OffsetDimension.hxx
+++ b/src/AIS/AIS_OffsetDimension.hxx
@@ -80,7 +80,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_OffsetDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)

 protected:

--- a/src/AIS/AIS_ParallelRelation.cxx
+++ b/src/AIS/AIS_ParallelRelation.cxx
@@ -52,6 +52,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
--- a/src/AIS/AIS_ParallelRelation.hxx
+++ b/src/AIS/AIS_ParallelRelation.hxx
@@ -76,7 +76,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_ParallelRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_PerpendicularRelation.cxx
+++ b/src/AIS/AIS_PerpendicularRelation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_PerpendicularRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : TwoEdgesPerpendicular
--- a/src/AIS/AIS_PerpendicularRelation.hxx
+++ b/src/AIS/AIS_PerpendicularRelation.hxx
@@ -71,7 +71,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_PerpendicularRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_PerpendicularRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_Plane.cxx
+++ b/src/AIS/AIS_Plane.cxx
@@ -54,6 +54,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <UnitsAPI.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Plane,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Plane
 //purpose  : 
--- a/src/AIS/AIS_Plane.hxx
+++ b/src/AIS/AIS_Plane.hxx
@@ -173,7 +173,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Plane,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Plane,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -54,6 +54,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <UnitsAPI.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_PlaneTrihedron,AIS_InteractiveObject)
+
 void  ExtremityPoints(TColgp_Array1OfPnt& PP,const Handle(Geom_Plane)& myPlane,const Handle(Prs3d_Drawer)& myDrawer);

 //=======================================================================
--- a/src/AIS/AIS_PlaneTrihedron.hxx
+++ b/src/AIS/AIS_PlaneTrihedron.hxx
@@ -120,7 +120,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_PlaneTrihedron,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_PlaneTrihedron,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_Point.cxx
+++ b/src/AIS/AIS_Point.cxx
@@ -37,6 +37,8 @@
 #include <StdPrs_Point.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Point,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Point
 //purpose  : 
--- a/src/AIS/AIS_Point.hxx
+++ b/src/AIS/AIS_Point.hxx
@@ -102,7 +102,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Point,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Point,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@@ -32,6 +32,8 @@
 #include <StdPrs_BndBox.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(AIS_PointCloud,AIS_InteractiveObject)
+
 //==================================================
 // Function: AIS_PointCloud
 // Purpose : Constructor
--- a/src/AIS/AIS_PointCloud.hxx
+++ b/src/AIS/AIS_PointCloud.hxx
@@ -122,7 +122,7 @@ private:

 public:

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

 };

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


+IMPLEMENT_STANDARD_RTTIEXT(AIS_RadiusDimension,AIS_Dimension)
+
 namespace
 {
  static const Standard_ExtCharacter THE_RADIUS_SYMBOL ('R');
--- a/src/AIS/AIS_RadiusDimension.hxx
+++ b/src/AIS/AIS_RadiusDimension.hxx
@@ -118,7 +118,7 @@ public:

 public:

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

 protected:

--- a/src/AIS/AIS_Relation.cxx
+++ b/src/AIS/AIS_Relation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Relation,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Relation
 //purpose  : 
--- a/src/AIS/AIS_Relation.hxx
+++ b/src/AIS/AIS_Relation.hxx
@@ -193,7 +193,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Relation,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Relation,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfTransient.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Selection,MMgt_TShared)
+
 #define MaxSizeOfResult 100000

 //current selection (handle)
--- a/src/AIS/AIS_Selection.hxx
+++ b/src/AIS/AIS_Selection.hxx
@@ -120,7 +120,7 @@ public:



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

 protected:

--- a/src/AIS/AIS_Shape.cxx
+++ b/src/AIS/AIS_Shape.cxx
@@ -68,6 +68,8 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Shape,AIS_InteractiveObject)
+
 static Standard_Boolean myFirstCompute;

 static Standard_Boolean IsInList(const TColStd_ListOfInteger& LL, const Standard_Integer aMode)
--- a/src/AIS/AIS_Shape.hxx
+++ b/src/AIS/AIS_Shape.hxx
@@ -241,7 +241,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Shape,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Shape,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_SignatureFilter.cxx
+++ b/src/AIS/AIS_SignatureFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_SignatureFilter,AIS_TypeFilter)
+
 AIS_SignatureFilter::AIS_SignatureFilter(const AIS_KindOfInteractive TheKind,
 					 const Standard_Integer      TheSignature):
 AIS_TypeFilter(TheKind),
--- a/src/AIS/AIS_SignatureFilter.hxx
+++ b/src/AIS/AIS_SignatureFilter.hxx
@@ -76,7 +76,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_SignatureFilter,AIS_TypeFilter)
+  DEFINE_STANDARD_RTTIEXT(AIS_SignatureFilter,AIS_TypeFilter)

 protected:

--- a/src/AIS/AIS_SymmetricRelation.cxx
+++ b/src/AIS/AIS_SymmetricRelation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_SymmetricRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_SymmetricRelation
 //purpose  : 
--- a/src/AIS/AIS_SymmetricRelation.hxx
+++ b/src/AIS/AIS_SymmetricRelation.hxx
@@ -82,7 +82,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_SymmetricRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_SymmetricRelation,AIS_Relation)

 protected:

--- a/src/AIS/AIS_TangentRelation.cxx
+++ b/src/AIS/AIS_TangentRelation.cxx
@@ -52,6 +52,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_TangentRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
--- a/src/AIS/AIS_TangentRelation.hxx
+++ b/src/AIS/AIS_TangentRelation.hxx
@@ -82,7 +82,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_TangentRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_TangentRelation,AIS_Relation)

 protected:

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


+IMPLEMENT_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_TextLabel
 //purpose  :
--- a/src/AIS/AIS_TextLabel.hxx
+++ b/src/AIS/AIS_TextLabel.hxx
@@ -115,7 +115,7 @@ protected:
 public:

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

 };

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


+IMPLEMENT_STANDARD_RTTIEXT(AIS_TexturedShape,AIS_Shape)
+
 //=======================================================================
 //function : AIS_TexturedShape
 //purpose  :
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -206,7 +206,7 @@ protected: //! @name texture mapping properties

 public:

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

 };

--- a/src/AIS/AIS_Triangulation.cxx
+++ b/src/AIS/AIS_Triangulation.cxx
@@ -28,6 +28,8 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>


+IMPLEMENT_STANDARD_RTTIEXT(AIS_Triangulation,AIS_InteractiveObject)
+
 AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation)
 {
  myTriangulation = Triangulation;
--- a/src/AIS/AIS_Triangulation.hxx
+++ b/src/AIS/AIS_Triangulation.hxx
@@ -64,7 +64,7 @@ public:



-  DEFINE_STANDARD_RTTI(AIS_Triangulation,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Triangulation,AIS_InteractiveObject)

 protected:

--- a/src/AIS/AIS_Trihedron.cxx
+++ b/src/AIS/AIS_Trihedron.cxx
@@ -57,6 +57,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>

+IMPLEMENT_STANDARD_RTTIEXT(AIS_Trihedron,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Trihedron
 //purpose  : 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
abv	2411731d34	Avoid recurrence in implicit instantiation of type descriptors	2015-11-29 16:33:05 +03:00
abv	40cf53299e	Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro	2015-11-28 15:34:35 +03:00
abv	c92a1d9864	Correction in macro	2015-11-28 15:28:13 +03:00
abv	054fcde1d8	Upgrade script	2015-11-28 12:56:08 +03:00
abv	305d92d7bf	Revive IMPLEMENT_STANDARD_RTTIEXT macro; two variants of DEFINE_STANDARD_RTTI macro (...EXT and ..._INLINE)	2015-11-28 08:10:27 +03:00