Foundation Classes - Update type declaration #232

Refactor type handling in BinMDataStd and Interface modules;
update RTTI implementations in StepVisual and XCAFDoc

diff --git a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
index c6f3ad78f16bbcb964de50164a63ffcc843755ed..ef54ba25c115e3f7eea3a8446ef0580d330e013c 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx
@@ -45,10 +45,9 @@ Handle(TDF_Attribute) BinMDataStd_GenericExtStringDriver::NewEmpty() const
 //function : SourceType
 //purpose  : 
 //=======================================================================
-Handle(Standard_Type)& BinMDataStd_GenericExtStringDriver::SourceType() const
+const Handle(Standard_Type)& BinMDataStd_GenericExtStringDriver::SourceType() const
 {
-  static Handle(Standard_Type) aSourceType = Standard_Type::Instance<TDataStd_GenericExtString>();
-  return aSourceType;
+  return Standard_Type::Instance<TDataStd_GenericExtString>();
 }
 
 //=======================================================================

diff --git a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
index a5efea089acb460001f4c80fe1a80e59c3fe965f..e20b2d62b460ed3a009d2d17704adaffd1f6f166 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.hxx
@@ -38,7 +38,7 @@ public:
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
 
-  Standard_EXPORT virtual Handle(Standard_Type)& SourceType() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const Handle(Standard_Type)& SourceType() const Standard_OVERRIDE;
 
   //! persistent -> transient (retrieve)
   Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE;

diff --git a/src/Interface/Interface_InterfaceModel.cxx b/src/Interface/Interface_InterfaceModel.cxx
index 7c1331345fbbb72929b301cbf8a163fe7112e5a9..9bbfb234463208e54a071dc55b61b9703156a6a7 100644 (file)
--- a/src/Interface/Interface_InterfaceModel.cxx
+++ b/src/Interface/Interface_InterfaceModel.cxx
@@ -44,8 +44,7 @@ static NCollection_DataMap<TCollection_AsciiString, Handle(Standard_Transient)>
 
 static const Handle(Standard_Type)& typerep()
 {
-  static  Handle(Standard_Type) tr = STANDARD_TYPE(Interface_ReportEntity);
-  return tr;
+  return STANDARD_TYPE(Interface_ReportEntity);
 }
 
 

diff --git a/src/StepVisual/StepVisual_CoordinatesList.cxx b/src/StepVisual/StepVisual_CoordinatesList.cxx
index 7caab6b96c77b5221472c9443196480b7cb8f254..ac83411114bfd30206a6d852300849c21b33c259 100644 (file)
--- a/src/StepVisual/StepVisual_CoordinatesList.cxx
+++ b/src/StepVisual/StepVisual_CoordinatesList.cxx
@@ -14,7 +14,7 @@
 
 #include <StepVisual_CoordinatesList.hxx>
 #include <StepVisual_TessellatedItem.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CoordinatesList,StepGeom_TessellatedItem)
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CoordinatesList, StepVisual_TessellatedItem)
 
 StepVisual_CoordinatesList::StepVisual_CoordinatesList ()  {}
 

diff --git a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
index da4f391e219836b05d2a8f87014baecf6e333180..7474863cd0251a77c22c0ab86b577580bfc54e9b 100644 (file)
--- a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
+++ b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
@@ -15,7 +15,7 @@
 #include <StepVisual_TessellatedGeometricSet.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedGeometricSet,StepGeom_TessellatedItem)
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedGeometricSet,StepVisual_TessellatedItem)
 
 
 StepVisual_TessellatedGeometricSet::StepVisual_TessellatedGeometricSet ()  {}

diff --git a/src/XCAFDoc/XCAFDoc_NotesTool.cxx b/src/XCAFDoc/XCAFDoc_NotesTool.cxx
index 28f46daa1a71bb1fdfe0c3af94b8b054b3b8bd08..3ad294c1ca225c04c736e99affb24971b6cdabf2 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_NotesTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_NotesTool.cxx
@@ -36,7 +36,7 @@ namespace {
 
 }
 
-IMPLEMENT_DERIVED_ATTRIBUTE(XCAFDoc_NotesTool, XCAFDoc_NoteComment)
+IMPLEMENT_DERIVED_ATTRIBUTE(XCAFDoc_NotesTool, TDataStd_GenericEmpty)
 
 enum NotesTool_RootLabels
 {