From 0fb39523e8a91c32630620ae5d61193ae2933feb Mon Sep 17 00:00:00 2001 From: svenbarth Date: Mon, 17 Jun 2019 20:48:58 +0000 Subject: * change Value argument of SetToString and result of of StringToSet from Integer to LongInt so that small sets are handled on 8/16-bit platforms as they are on 32- and 64-bit git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@42245 3ad0048d-3df7-0310-abae-a5850022a9f2 --- rtl/objpas/typinfo.pp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp index beee4b391d..9ab3cd905c 100644 --- a/rtl/objpas/typinfo.pp +++ b/rtl/objpas/typinfo.pp @@ -881,13 +881,13 @@ procedure AddEnumElementAliases(aTypeInfo: PTypeInfo; const aNames: array of str procedure RemoveEnumElementAliases(aTypeInfo: PTypeInfo); function GetEnumeratedAliasValue(aTypeInfo: PTypeInfo; const aName: string): Integer; -function SetToString(TypeInfo: PTypeInfo; Value: Integer; Brackets: Boolean) : String; -function SetToString(PropInfo: PPropInfo; Value: Integer; Brackets: Boolean) : String; -function SetToString(PropInfo: PPropInfo; Value: Integer) : String; +function SetToString(TypeInfo: PTypeInfo; Value: LongInt; Brackets: Boolean) : String; +function SetToString(PropInfo: PPropInfo; Value: LongInt; Brackets: Boolean) : String; +function SetToString(PropInfo: PPropInfo; Value: LongInt) : String; function SetToString(TypeInfo: PTypeInfo; Value: Pointer; Brackets: Boolean = False) : String; function SetToString(PropInfo: PPropInfo; Value: Pointer; Brackets: Boolean = False) : String; -function StringToSet(PropInfo: PPropInfo; const Value: string): Integer; -function StringToSet(TypeInfo: PTypeInfo; const Value: string): Integer; +function StringToSet(PropInfo: PPropInfo; const Value: string): LongInt; +function StringToSet(TypeInfo: PTypeInfo; const Value: string): LongInt; procedure StringToSet(PropInfo: PPropInfo; const Value: String; Result: Pointer); procedure StringToSet(TypeInfo: PTypeInfo; const Value: String; Result: Pointer); @@ -1045,13 +1045,13 @@ begin end; -Function SetToString(PropInfo: PPropInfo; Value: Integer; Brackets: Boolean) : String; +Function SetToString(PropInfo: PPropInfo; Value: LongInt; Brackets: Boolean) : String; begin Result:=SetToString(PropInfo^.PropType, @Value, Brackets); end; -Function SetToString(TypeInfo: PTypeInfo; Value: Integer; Brackets: Boolean) : String; +Function SetToString(TypeInfo: PTypeInfo; Value: LongInt; Brackets: Boolean) : String; begin Result := SetToString(TypeInfo, @Value, Brackets); end; @@ -1115,7 +1115,7 @@ begin Result:='['+Result+']'; end; -Function SetToString(PropInfo: PPropInfo; Value: Integer) : String; +Function SetToString(PropInfo: PPropInfo; Value: LongInt) : String; begin Result:=SetToString(PropInfo,Value,False); @@ -1144,13 +1144,13 @@ begin end; end; -Function StringToSet(PropInfo: PPropInfo; const Value: string): Integer; +Function StringToSet(PropInfo: PPropInfo; const Value: string): LongInt; begin StringToSet(PropInfo^.PropType,Value,@Result); end; -Function StringToSet(TypeInfo: PTypeInfo; const Value: string): Integer; +Function StringToSet(TypeInfo: PTypeInfo; const Value: string): LongInt; begin StringToSet(TypeInfo, Value, @Result); end; -- cgit v1.2.1