diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-06-05 12:18:06 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-06-05 12:18:06 +0000 |
commit | ff20dad8887a6b297bdc7681736be35f02f04458 (patch) | |
tree | a392781b6c1f21468bf59846c5b5298999320c4a | |
parent | e1c932855092bc7e8cdd15b551574ea5804ef5e3 (diff) | |
download | fpc-ff20dad8887a6b297bdc7681736be35f02f04458.tar.gz |
- reverted merge of r32824: that commit contained new functionality,
was buggy and broke JVM building
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33914 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | rtl/inc/ustringh.inc | 6 | ||||
-rw-r--r-- | rtl/inc/ustrings.inc | 61 |
2 files changed, 0 insertions, 67 deletions
diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc index 502e9bd852..ecaf2805a7 100644 --- a/rtl/inc/ustringh.inc +++ b/rtl/inc/ustringh.inc @@ -133,12 +133,6 @@ function Utf8ToUnicode(Dest: PUnicodeChar; MaxDestChars: SizeUInt; Source: PChar function UTF8Encode(const s : RawByteString) : RawByteString; inline; function UTF8Encode(const s : UnicodeString) : RawByteString; function UTF8Decode(const s : RawByteString): UnicodeString; -function UTF8ToString(const s : UTF8String): UnicodeString;inline; -function UTF8ToString(const s : RawByteString): UnicodeString;inline; -function UTF8ToString(const S: ShortString): unicodestring; -function UTF8ToString(const S: PAnsiChar): unicodestring; -function UTF8ToString(const S: array of AnsiChar): unicodestring; -function UTF8ToString(const S: array of Byte): unicodestring; function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif} function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif} function UnicodeStringToUCS4String(const s : UnicodeString) : UCS4String; diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc index 88b0cb21fb..096b9b5e09 100644 --- a/rtl/inc/ustrings.inc +++ b/rtl/inc/ustrings.inc @@ -2357,64 +2357,3 @@ Begin Result:=Str; SetCodePage(Result,DefaultFileSystemCodePage,True); End; - -function UTF8ToString(const S: UTF8String): UnicodeString; inline; -begin - Result := UTF8Decode(S); -end; - -function UTF8ToString(const S: RawByteString): UnicodeString; inline; - -Var - UTF8 : UTF8String; - -begin - UTF8:=S; - Result := UTF8Decode(UTF8); -end; - -function UTF8ToString(const S: ShortString): UnicodeString; - -Var - UTF8 : UTF8String; - -begin - UTF8:=S; - Result := UTF8Decode(UTF8); -end; - -function UTF8ToString(const S: PAnsiChar): UnicodeString; -var - UTF: UTF8String; - Count: Integer; -begin - Count := StrLen(S); - SetLength(UTF, Count); - if Count > 0 then - Move(S^, UTF[1], Count); - Result := UTF8ToString(UTF); -end; - -function UTF8ToString(const S: array of AnsiChar): UnicodeString; -var - UTF: UTF8String; - Count: Integer; -begin - Count := Length(S); - SetLength(UTF, Count); - if Count > 0 then - Move(S[Low(S)], UTF[1], Count); - Result := UTF8ToString(UTF); -end; - -function UTF8ToString(const S: array of Byte): UnicodeString; -var - UTF: UTF8String; - Count: Integer; -begin - Count := Length(S); - SetLength(UTF, Count); - if Count > 0 then - Move(S[Low(S)], UTF[1], Count); - Result := UTF8ToString(UTF); -end; |