summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2016-06-02 19:30:43 +0000
committermarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2016-06-02 19:30:43 +0000
commit7a419225837ea44f66a11aebc63860fcfe3635d7 (patch)
treef14cacbf3490f84a8fb34ad01508cd106d29f891
parent85ab103dc27ae2c6f74ee3730fa49dea68544629 (diff)
downloadfpc-7a419225837ea44f66a11aebc63860fcfe3635d7.tar.gz
--- Merging r32864 into '.':
U rtl/objpas/typinfo.pp --- Recording mergeinfo for merge of r32864 into '.': U . # revisions: 32864 git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33880 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--rtl/objpas/typinfo.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp
index 534d0235a8..293ee0593c 100644
--- a/rtl/objpas/typinfo.pp
+++ b/rtl/objpas/typinfo.pp
@@ -52,7 +52,7 @@ unit typinfo;
TFloatType = (ftSingle,ftDouble,ftExtended,ftComp,ftCurr);
{$endif}
TMethodKind = (mkProcedure,mkFunction,mkConstructor,mkDestructor,
- mkClassProcedure,mkClassFunction,mkClassConstructor,
+ mkClassProcedure,mkClassFunction,mkClassConstructor,
mkClassDestructor,mkOperatorOverload);
TParamFlag = (pfVar,pfConst,pfArray,pfAddress,pfReference,pfOut);
TParamFlags = set of TParamFlag;
@@ -2009,7 +2009,7 @@ end;
Function GetPropValue(Instance: TObject; PropInfo: PPropInfo; PreferStrings: Boolean): Variant;
begin
- CheckVariantEvent(Pointer(OnGetPropValue));
+ CheckVariantEvent(CodePointer(OnGetPropValue));
Result:=OnGetPropValue(Instance,PropInfo,PreferStrings);
end;
@@ -2022,8 +2022,8 @@ end;
Procedure SetPropValue(Instance: TObject; PropInfo: PPropInfo; const Value: Variant);
begin
- CheckVariantEvent(Pointer(OnSetPropValue));
- OnSetPropValue(Instance,PropInfo,Value);
+ CheckVariantEvent(CodePointer(OnSetPropValue));
+ OnSetPropValue(Instance,PropInfo,Value);
end;