mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0026936: Drawbacks of inlining in new type system in OCCT 7.0 -- automatic
Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro (upgrade -rtti)
This commit is contained in:
@@ -18,6 +18,8 @@
|
||||
#include <Standard_Assert.hxx>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_AccAllocator,NCollection_BaseAllocator)
|
||||
|
||||
//=======================================================================
|
||||
//function : NCollection_AccAllocator
|
||||
//purpose : Constructor
|
||||
|
@@ -173,7 +173,7 @@ protected:
|
||||
|
||||
// Declaration of CASCADE RTTI
|
||||
public:
|
||||
DEFINE_STANDARD_RTTI (NCollection_AccAllocator, NCollection_BaseAllocator)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_AccAllocator,NCollection_BaseAllocator)
|
||||
};
|
||||
|
||||
// Definition of HANDLE object using Standard_DefineHandle.hxx
|
||||
|
@@ -19,6 +19,8 @@
|
||||
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_AlignedAllocator,NCollection_BaseAllocator)
|
||||
|
||||
//=======================================================================
|
||||
//function : NCollection_AlignedAllocator()
|
||||
//purpose : Constructor
|
||||
|
@@ -46,7 +46,7 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
DEFINE_STANDARD_RTTI (NCollection_AlignedAllocator, NCollection_BaseAllocator)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_AlignedAllocator,NCollection_BaseAllocator)
|
||||
|
||||
};
|
||||
|
||||
|
@@ -25,6 +25,8 @@
|
||||
#include <iomanip>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_BaseAllocator,MMgt_TShared)
|
||||
|
||||
//=======================================================================
|
||||
//function : Allocate
|
||||
//purpose : Standard allocation
|
||||
|
@@ -78,7 +78,7 @@ class NCollection_BaseAllocator : public MMgt_TShared
|
||||
|
||||
public:
|
||||
// ---------- CasCade RunTime Type Information
|
||||
DEFINE_STANDARD_RTTI(NCollection_BaseAllocator, MMgt_TShared)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_BaseAllocator,MMgt_TShared)
|
||||
};
|
||||
|
||||
DEFINE_STANDARD_HANDLE(NCollection_BaseAllocator,MMgt_TShared)
|
||||
|
@@ -130,7 +130,7 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
DEFINE_STANDARD_RTTI(NCollection_Buffer, Standard_Transient) // Type definition
|
||||
DEFINE_STANDARD_RTTI_INLINE(NCollection_Buffer,Standard_Transient) // Type definition
|
||||
|
||||
};
|
||||
|
||||
|
@@ -39,7 +39,7 @@ class HClassName : public _Array1Type_, public MMgt_TShared { \
|
||||
HClassName (const _Array1Type_& theOther) : _Array1Type_(theOther) {} \
|
||||
const _Array1Type_& Array1 () const { return *this; } \
|
||||
_Array1Type_& ChangeArray1 () { return *this; } \
|
||||
DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared) \
|
||||
DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared) \
|
||||
}; \
|
||||
DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared)
|
||||
|
||||
|
@@ -44,7 +44,7 @@ class HClassName : public _Array2Type_, public MMgt_TShared { \
|
||||
HClassName (const _Array2Type_& theOther) : _Array2Type_(theOther) {} \
|
||||
const _Array2Type_& Array2 () const { return *this; } \
|
||||
_Array2Type_& ChangeArray2 () { return *this; } \
|
||||
DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared) \
|
||||
DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared) \
|
||||
}; \
|
||||
DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared)
|
||||
|
||||
|
@@ -44,7 +44,7 @@ class HClassName : public _SequenceType_, public MMgt_TShared { \
|
||||
typename std::enable_if<std::is_base_of<HClassName, T>::value>::type * = 0) { \
|
||||
_SequenceType_::Append (theOther->ChangeSequence()); \
|
||||
} \
|
||||
DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared) \
|
||||
DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared) \
|
||||
}; \
|
||||
DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared)
|
||||
|
||||
|
@@ -208,7 +208,7 @@ class _HEBTREE : public _HUBTREE \
|
||||
const EBTree& ETree () const { return (const EBTree&) Tree(); } \
|
||||
EBTree& ChangeETree () { return (EBTree&) ChangeTree(); } \
|
||||
\
|
||||
DEFINE_STANDARD_RTTI (_HEBTREE, _HUBTREE) \
|
||||
DEFINE_STANDARD_RTTI_INLINE(_HEBTREE,_HUBTREE) \
|
||||
/* Type management */ \
|
||||
}; \
|
||||
DEFINE_STANDARD_HANDLE (_HEBTREE, _HUBTREE)
|
||||
|
@@ -18,6 +18,8 @@
|
||||
#include <Standard_Mutex.hxx>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_HeapAllocator,NCollection_BaseAllocator)
|
||||
|
||||
//=======================================================================
|
||||
//function : Allocate
|
||||
//purpose :
|
||||
|
@@ -43,7 +43,7 @@ class NCollection_HeapAllocator : public NCollection_BaseAllocator
|
||||
|
||||
public:
|
||||
// Declaration of CASCADE RTTI
|
||||
DEFINE_STANDARD_RTTI (NCollection_HeapAllocator, NCollection_BaseAllocator)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_HeapAllocator,NCollection_BaseAllocator)
|
||||
};
|
||||
|
||||
// Definition of HANDLE object using Standard_DefineHandle.hxx
|
||||
|
@@ -23,6 +23,8 @@
|
||||
#include <iomanip>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_IncAllocator,NCollection_BaseAllocator)
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
|
@@ -111,7 +111,7 @@ class NCollection_IncAllocator : public NCollection_BaseAllocator
|
||||
|
||||
public:
|
||||
// Declaration of CASCADE RTTI
|
||||
DEFINE_STANDARD_RTTI (NCollection_IncAllocator, NCollection_BaseAllocator)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_IncAllocator,NCollection_BaseAllocator)
|
||||
};
|
||||
|
||||
// Definition of HANDLE object using Standard_DefineHandle.hxx
|
||||
|
@@ -482,7 +482,7 @@ class _HUBTREE : public _HPARENT \
|
||||
~_HUBTREE () { delete myTree; } \
|
||||
/* Destructor */ \
|
||||
\
|
||||
DEFINE_STANDARD_RTTI (_HUBTREE, _HPARENT) \
|
||||
DEFINE_STANDARD_RTTI_INLINE(_HUBTREE,_HPARENT) \
|
||||
/* Type management */ \
|
||||
\
|
||||
private: \
|
||||
|
@@ -16,6 +16,8 @@
|
||||
#include <NCollection_WinHeapAllocator.hxx>
|
||||
#include <Standard_OutOfMemory.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(NCollection_WinHeapAllocator,NCollection_BaseAllocator)
|
||||
|
||||
#if(defined(_WIN32) || defined(__WIN32__))
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
@@ -48,7 +48,7 @@ public:
|
||||
Standard_EXPORT virtual void Free (void* theAddress) Standard_OVERRIDE;
|
||||
|
||||
// Declaration of CASCADE RTTI
|
||||
DEFINE_STANDARD_RTTI(NCollection_WinHeapAllocator, NCollection_BaseAllocator)
|
||||
DEFINE_STANDARD_RTTIEXT(NCollection_WinHeapAllocator,NCollection_BaseAllocator)
|
||||
|
||||
private:
|
||||
//! Copy constructor - prohibited
|
||||
|
Reference in New Issue
Block a user