paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-01 22:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #36234: unicodedatastering must be of type unicodestring

Browse Source 
git-svn-id: trunk@43357 -
This commit is contained in:
michael 2019-11-02 11:51:28 +00:00
parent c6f53adf89
commit 20ca7d857c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/classes/classesh.inc
View File

@ -1199,7 +1199,7 @@ type
FEncoding: TEncoding;
FOwnsEncoding : Boolean;
function GetDataString: string;
function GetUnicodeDataString: String;
function GetUnicodeDataString: UnicodeString;
protected
public
constructor Create(const ABytes: TBytes); override; overload;
@ -1219,7 +1219,7 @@ type
function ReadString(Count: Longint): string;
procedure WriteString(const AString: string);
property DataString: string read GetDataString;
Property UnicodeDataString : String Read GetUnicodeDataString;
Property UnicodeDataString : UnicodeString Read GetUnicodeDataString;
Property OwnsEncoding : Boolean Read FOwnsEncoding;
Property Encoding : TEncoding Read FEncoding;
end;

2
rtl/objpas/classes/streams.inc
View File

@ -1522,7 +1522,7 @@ begin
Result:=FEncoding.GetAnsiString(Bytes,0,Size);
end;
function TStringStream.GetUnicodeDataString: String;
function TStringStream.GetUnicodeDataString: UnicodeString;
begin
Result:=FEncoding.GetString(Bytes, 0, Size);
end;