0028355: Stating wrong parent class in DEFINE_STANDARD_RTTIEXT is not recognized...

Added compile-time checks (static_assert) in DEFINE_STANDARD_RTTI*(A,B) macros to check that A is actually the class being defined, and B is its base class.
For GCC compiler version 4.7 and later on, check ensures that B is direct base class of A.

Fixed dubious RTTI definitions.

diff --git a/samples/qt/FuncDemo/src/CircleDriver.h b/samples/qt/FuncDemo/src/CircleDriver.h
index 3e3be8b68be08405a1fc7bdf98625254f3baf350..11d55c274ebbbe6eea9a20ada6b0f1d1ddbb3e36 100644 (file)
--- a/samples/qt/FuncDemo/src/CircleDriver.h
+++ b/samples/qt/FuncDemo/src/CircleDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(CircleDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(CircleDriver, BaseDriver)
 };
 
 #endif // !defined(_CIRCLEDRIVER_H_)

diff --git a/samples/qt/FuncDemo/src/ConeDriver.h b/samples/qt/FuncDemo/src/ConeDriver.h
index c397b7711887aabfa280122e77b07eebc07d3d38..a7f9439f42831f3ef9951efc2928a57905b0e614 100644 (file)
--- a/samples/qt/FuncDemo/src/ConeDriver.h
+++ b/samples/qt/FuncDemo/src/ConeDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(ConeDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(ConeDriver, BaseDriver)
 };
 
 #endif // !defined(_CONEDRIVER_H_)

diff --git a/samples/qt/FuncDemo/src/CylinderDriver.h b/samples/qt/FuncDemo/src/CylinderDriver.h
index 322d186704aa3417ecf2cdc403270e3daf8e76ce..bfa8ee66d52d12d7d0dcddf8921b63fdc7679b24 100644 (file)
--- a/samples/qt/FuncDemo/src/CylinderDriver.h
+++ b/samples/qt/FuncDemo/src/CylinderDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(CylinderDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(CylinderDriver, BaseDriver)
 };
 
 #endif // !defined(_CYLINDERDRIVER_H_)

diff --git a/samples/qt/FuncDemo/src/PointDriver.h b/samples/qt/FuncDemo/src/PointDriver.h
index a71591b881f66053e7676329c20ae580f87e283a..01592374681345aff3339a80102c10131b84aa98 100644 (file)
--- a/samples/qt/FuncDemo/src/PointDriver.h
+++ b/samples/qt/FuncDemo/src/PointDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(PointDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(PointDriver, BaseDriver)
 };
 
 #endif // !defined(_PointDRIVER_H_)

diff --git a/samples/qt/FuncDemo/src/PrismDriver.h b/samples/qt/FuncDemo/src/PrismDriver.h
index 5f11dcba3e0b41a8662e48106091ce8ef16848d6..778b1cd92f87f65165c99c58eff22cbeb804ad81 100644 (file)
--- a/samples/qt/FuncDemo/src/PrismDriver.h
+++ b/samples/qt/FuncDemo/src/PrismDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(PrismDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(PrismDriver, BaseDriver)
 };
 
 #endif // !defined(_PRISMDRIVER_H_)

diff --git a/samples/qt/FuncDemo/src/ShapeSaverDriver.h b/samples/qt/FuncDemo/src/ShapeSaverDriver.h
index cf3c399a831456d0d830c8319824a4af28b64e22..5247949b787949180289da622114cdbb2ba414fd 100644 (file)
--- a/samples/qt/FuncDemo/src/ShapeSaverDriver.h
+++ b/samples/qt/FuncDemo/src/ShapeSaverDriver.h
@@ -30,7 +30,7 @@ public:
        // Execution.
        virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
-       DEFINE_STANDARD_RTTIEXT(ShapeSaverDriver, TFunction_Driver)
+       DEFINE_STANDARD_RTTIEXT(ShapeSaverDriver, BaseDriver)
 };
 
 #endif // !defined(_SHAPESAVERDRIVER_H_)

diff --git a/src/AIS/AIS_AnimationTimer.hxx b/src/AIS/AIS_AnimationTimer.hxx
index 14add5186ac3f00ce10346a2a87ed71ec48bcaaf..1970eadcf9176765ea6d8f4812ea2d8de605fda7 100644 (file)
--- a/src/AIS/AIS_AnimationTimer.hxx
+++ b/src/AIS/AIS_AnimationTimer.hxx
@@ -22,7 +22,7 @@
 //! Auxiliary class defining the animation timer.
 class AIS_AnimationTimer : public Standard_Transient
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_Animation, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(AIS_AnimationTimer, Standard_Transient)
 public:
 
   //! Empty constructor.

diff --git a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
index 4e32813424d841a8bd17f0e9e030b019038b5b7c..c7851cc4aed1b741dfc95d4c872923fda43560a3 100644 (file)
--- a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
+++ b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
@@ -92,7 +92,7 @@ private:
 
   void cacheVertexProjections (SelectMgr_TriangularFrustum* theFrustum) const;
 
-  DEFINE_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,SelectMgr_Frustum<3>)
 };
 
 #endif // _SelectMgr_TriangularFrustum_HeaderFile

diff --git a/src/Standard/Standard_Type.hxx b/src/Standard/Standard_Type.hxx
index 76e9725706203ae7269aacb9511b2f540dfebc29..bbcf0075f1c4654de4380141b927cba58a0961c2 100644 (file)
--- a/src/Standard/Standard_Type.hxx
+++ b/src/Standard/Standard_Type.hxx
@@ -22,6 +22,52 @@
 
 #include <typeinfo>
 
+// Auxiliary tools to check at compile time that class declared as base in 
+// DEFINE_STANDARD_RTTI* macro is actually a base class.
+// For GCC 4.7+, more strict check is possible -- ensuring that base class 
+// is direct base -- using non-standard C++ reflection functionality.
+#if ! defined(OCC_CHECK_BASE_CLASS)
+#if (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (__GNUC__ > 4)))
+
+#include <tr2/type_traits>
+#include <tuple>
+
+namespace opencascade 
+{
+  template<typename T>
+  struct direct_base_class_as_tuple {};
+
+  template<typename ... Ts>
+  struct direct_base_class_as_tuple<std::tr2::__reflection_typelist<Ts...> >
+  {
+    typedef std::tuple<Ts...> type;
+  };
+
+  template <typename T, typename Tuple>
+  struct has_type;
+
+  template <typename T>
+  struct has_type<T, std::tuple<> > : std::false_type {};
+
+  template <typename T, typename U, typename... Ts>
+  struct has_type<T, std::tuple<U, Ts...> > : has_type<T, std::tuple<Ts...> > {};
+
+  template <typename T, typename... Ts>
+  struct has_type<T, std::tuple<T, Ts...> > : std::true_type {};
+}
+
+#define OCC_CHECK_BASE_CLASS(Class,Base) \
+  using direct_base_classes = opencascade::direct_base_class_as_tuple<std::tr2::direct_bases<Class>::type>::type; \
+  static_assert(opencascade::has_type<Base, direct_base_classes>::type::value, "OCCT RTTI definition is incorrect: " #Base " is not direct base class of " #Class);
+
+#else /* ! GCC 4.7+ */
+
+#define OCC_CHECK_BASE_CLASS(Class,Base) \
+  static_assert(opencascade::is_base_but_not_same<Base, Class>::value, "OCCT RTTI definition is incorrect: " #Base " is not base class of " #Class);
+
+#endif /* GCC 4.7+ */
+#endif /* ! defined(OCC_CHECK_BASE_CLASS) */
+
 //! Helper macro to get instance of a type descriptor for a class in a legacy way.
 #define STANDARD_TYPE(theType) theType::get_type_descriptor()
 
@@ -33,10 +79,12 @@
 #define DEFINE_STANDARD_RTTI_INLINE(Class,Base) \
 public: \
   typedef Base base_type; \
-  static const char* get_type_name () { return #Class; } \
+  static const char* get_type_name () { return #Class; OCC_CHECK_BASE_CLASS(Class,Base) } \
   static const Handle(Standard_Type)& get_type_descriptor () { return Standard_Type::Instance<Class>(); } \
-  virtual const Handle(Standard_Type)& DynamicType() const Standard_OVERRIDE \
-  { return STANDARD_TYPE(Class); }
+  virtual const Handle(Standard_Type)& DynamicType() const Standard_OVERRIDE { \
+    static_assert(std::is_same<const Class*, decltype(this)>::value, "OCCT RTTI definition is misplaced: current class is not " #Class); \
+    return get_type_descriptor (); \
+  }
 
 //! Helper macro to be included in definition of the classes inheriting
 //! Standard_Transient to enable use of OCCT RTTI.
@@ -45,14 +93,17 @@ public: \
 #define DEFINE_STANDARD_RTTIEXT(Class,Base) \
 public: \
   typedef Base base_type; \
-  static const char* get_type_name () { return #Class; } \
+  static const char* get_type_name () { return #Class; OCC_CHECK_BASE_CLASS(Class,Base) } \
   Standard_EXPORT static const Handle(Standard_Type)& get_type_descriptor (); \
   Standard_EXPORT virtual const Handle(Standard_Type)& DynamicType() const Standard_OVERRIDE;
 
 //! Defines implementation of type descriptor and DynamicType() function
 #define IMPLEMENT_STANDARD_RTTIEXT(Class,Base) \
   const Handle(Standard_Type)& Class::get_type_descriptor () { return Standard_Type::Instance<Class>(); } \
-  const Handle(Standard_Type)& Class::DynamicType() const { return get_type_descriptor(); }
+  const Handle(Standard_Type)& Class::DynamicType() const { \
+    static_assert(std::is_same<const Class*, decltype(this)>::value, "OCCT RTTI definition is misplaced: current class is not " #Class); \
+    return STANDARD_TYPE(Class); \
+  }
 
 // forward declaration of type_instance class
 namespace opencascade {

diff --git a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx b/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx
index d8df7d28c68683fbf4fd57bb809134b708a002f5..4a49329a94b1d74f7f81fbe0a41eb75a29f32b32 100644 (file)
--- a/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx
+++ b/src/StepVisual/StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation.hxx
@@ -32,7 +32,7 @@ public:
   
   Standard_EXPORT StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation();
 
-  DEFINE_STANDARD_RTTIEXT(CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, StepVisual_DraughtingModel)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation, StepVisual_DraughtingModel)
 
 };
 #endif // _StepVisual_CharacterizedObjectAndCharacterizedRepresentationAndDraughtingModelAndRepresentation_HeaderFile

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index 914ebdca6286da76fe30dbfa5e65b0c170a16c5f..358a35ae7d9698b93c05fb14e2cab395e3ac18fb 100644 (file)
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -4809,7 +4809,7 @@ public:
     myMarkerAspect = theMarkerAspect;
   }
 
-  DEFINE_STANDARD_RTTI_INLINE(MyPArrayObject,AIS_InteractiveObject);
+  DEFINE_STANDARD_RTTI_INLINE(ViewerTest_MarkersArrayObject,AIS_InteractiveObject);
 
 private: