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

* made TObject usable, even if no ansistring support is available

Browse Source 
git-svn-id: trunk@34974 -
This commit is contained in:
florian 2016-11-26 19:33:31 +00:00
parent da7e1b3769
commit bcb7061314
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/objpas.inc
View File

@ -946,7 +946,7 @@
getinterfacetable:=PVmt(Self)^.vIntfTable;
end;
class function TObject.UnitName : ansistring;
class function TObject.UnitName : {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
type
// from the typinfo unit
TClassTypeInfo = {$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}packed{$endif}record
@ -994,7 +994,7 @@
result:=PtrInt(Self);
end;
function TObject.ToString: ansistring;
function TObject.ToString: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
begin
result:=ClassName;
end;

4
rtl/inc/objpash.inc
View File

@ -248,11 +248,11 @@
class function GetInterfaceTable : pinterfacetable;
{ new since Delphi 2009 }
class function UnitName : ansistring;
class function UnitName : {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
class function QualifiedClassName: ansistring;
function Equals(Obj: TObject) : boolean;virtual;
function GetHashCode: PtrInt;virtual;
function ToString: ansistring;virtual;
function ToString: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};virtual;
end;
IUnknown = interface