mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-08 14:17:06 +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:
@@ -8,11 +8,10 @@
|
||||
#include <TColStd_Array1OfReal.hxx>
|
||||
#include <Geom2d_BSplineCurve.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession2D_Curve,AIS_InteractiveObject)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
|
||||
|
||||
|
||||
ISession2D_Curve::ISession2D_Curve(const Handle_Geom2d_Curve aGeom2dCurve,
|
||||
ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve,
|
||||
const Aspect_TypeOfLine aTypeOfLine,
|
||||
const Aspect_WidthOfLine aWidthOfLine,
|
||||
const Standard_Integer aColorIndex)
|
||||
|
@@ -15,7 +15,7 @@
|
||||
#include <Standard_IStream.hxx>
|
||||
#include <Standard_CString.hxx>
|
||||
|
||||
class TColGeom2d_HSequenceOfCurve;
|
||||
#include <TColGeom2d_HSequenceOfCurve.hxx>
|
||||
class PrsMgr_PresentationManager2d;
|
||||
class Graphic2d_GraphicObject;
|
||||
class SelectMgr_Selection;
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
//
|
||||
|
||||
ISession2D_Curve
|
||||
(const Handle_Geom2d_Curve aGeom2dCurve,
|
||||
(const Handle(Geom2d_Curve) aGeom2dCurve,
|
||||
const Aspect_TypeOfLine aTypeOfline = Aspect_TOL_SOLID,
|
||||
const Aspect_WidthOfLine aWidthOfLine = Aspect_WOL_MEDIUM,
|
||||
const Standard_Integer aColorIndex = 4);
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
inline Standard_Real GetDiscretisation() const;
|
||||
inline void SetDiscretisation(const Standard_Real aNewDiscretisation) ;
|
||||
|
||||
DEFINE_STANDARD_RTTI(ISession2D_Curve,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
|
||||
|
||||
private:
|
||||
|
||||
@@ -70,7 +70,7 @@ private:
|
||||
|
||||
// Fields PRIVATE
|
||||
//
|
||||
Handle_Geom2d_Curve myGeom2dCurve;
|
||||
Handle(Geom2d_Curve) myGeom2dCurve;
|
||||
Aspect_TypeOfLine myTypeOfLine;
|
||||
Aspect_WidthOfLine myWidthOfLine;
|
||||
Standard_Integer myColorIndex;
|
||||
|
@@ -7,7 +7,6 @@
|
||||
#include "ISession_Curve.h"
|
||||
#include <StdPrs_PoleCurve.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
|
||||
|
||||
#ifdef _DEBUG
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
ISession_Curve(Handle(Geom_Curve)& aCurve);
|
||||
virtual ~ISession_Curve();
|
||||
|
||||
DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -13,7 +13,6 @@
|
||||
static char THIS_FILE[]=__FILE__;
|
||||
#endif
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession_Direction,AIS_InteractiveObject)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@@ -26,7 +26,7 @@ public:
|
||||
ISession_Direction (const gp_Pnt2d& aPnt2d,const gp_Vec2d& aVec2d);
|
||||
|
||||
virtual ~ISession_Direction();
|
||||
DEFINE_STANDARD_RTTI(ISession_Direction,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
|
||||
|
||||
private:
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
static char THIS_FILE[]=__FILE__;
|
||||
//#define new DEBUG_NEW
|
||||
#endif
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession_Point,AIS_InteractiveObject)
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession_Point,AIS_InteractiveObject)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@@ -22,7 +22,7 @@ public:
|
||||
ISession_Point(const gp_Pnt2d& aPoint,Standard_Real Elevation = 0);
|
||||
ISession_Point(const gp_Pnt& aPoint);
|
||||
virtual ~ISession_Point();
|
||||
DEFINE_STANDARD_RTTI(ISession_Point,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession_Point,AIS_InteractiveObject)
|
||||
|
||||
private :
|
||||
|
||||
|
@@ -15,7 +15,7 @@
|
||||
static char THIS_FILE[]=__FILE__;
|
||||
//#define new DEBUG_NEW
|
||||
#endif
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession_Surface,AIS_InteractiveObject)
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@@ -20,7 +20,7 @@ public:
|
||||
ISession_Surface(Handle(Geom_Surface)& aSurface);
|
||||
virtual ~ISession_Surface();
|
||||
|
||||
DEFINE_STANDARD_RTTI(ISession_Surface,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
|
||||
private:
|
||||
|
||||
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
|
||||
|
@@ -11,7 +11,7 @@
|
||||
static char THIS_FILE[]=__FILE__;
|
||||
//#define new DEBUG_NEW
|
||||
#endif
|
||||
IMPLEMENT_STANDARD_HANDLE(ISession_Text,AIS_InteractiveObject)
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@@ -69,7 +69,7 @@ inline Quantity_Factor GetScale() const;
|
||||
inline void SetScale (const Quantity_Factor aNewScale) ;
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI(ISession_Text,AIS_InteractiveObject)
|
||||
DEFINE_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
|
||||
|
||||
private:
|
||||
|
||||
|
Reference in New Issue
Block a user