From bfd37969ad53f71fdbe8f82dbff193a34b0d6e27 Mon Sep 17 00:00:00 2001 From: svenbarth Date: Fri, 6 Oct 2017 13:10:01 +0000 Subject: [PATCH] * move TRttiStructuredType and TRttiInstanceType further down as they need access to TRttiMember and its children git-svn-id: trunk@37408 - --- packages/rtl-objpas/src/inc/rtti.pp | 39 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/packages/rtl-objpas/src/inc/rtti.pp b/packages/rtl-objpas/src/inc/rtti.pp index 78dd20171b..9dcf0df34b 100644 --- a/packages/rtl-objpas/src/inc/rtti.pp +++ b/packages/rtl-objpas/src/inc/rtti.pp @@ -205,10 +205,6 @@ type property TypeSize: integer read GetTypeSize; end; - TRttiStructuredType = class(TRttiType) - - end; - { TRttiFloatType } TRttiFloatType = class(TRttiType) @@ -237,22 +233,6 @@ type property ReferredType: TRttiType read GetReferredType; end; - { TRttiInstanceType } - - TRttiInstanceType = class(TRttiStructuredType) - private - function GetDeclaringUnitName: string; - function GetMetaClassType: TClass; - protected - function GetIsInstance: boolean; override; - function GetTypeSize: integer; override; - function GetBaseType: TRttiType; override; - public - property MetaClassType: TClass read GetMetaClassType; - property DeclaringUnitName: string read GetDeclaringUnitName; - - end; - { TRttiMember } TMemberVisibility=(mvPrivate, mvProtected, mvPublic, mvPublished); @@ -290,6 +270,25 @@ type property Visibility: TMemberVisibility read GetVisibility; end; + TRttiStructuredType = class(TRttiType) + + end; + + { TRttiInstanceType } + + TRttiInstanceType = class(TRttiStructuredType) + private + function GetDeclaringUnitName: string; + function GetMetaClassType: TClass; + protected + function GetIsInstance: boolean; override; + function GetTypeSize: integer; override; + function GetBaseType: TRttiType; override; + public + property MetaClassType: TClass read GetMetaClassType; + property DeclaringUnitName: string read GetDeclaringUnitName; + end; + EInsufficientRtti = class(Exception); EInvocationError = class(Exception); ENonPublicType = class(Exception);