Browse Source

* Correct string types in Exception definition

Michael VAN CANNEYT 2 years ago
parent
commit
eece88e95a
2 changed files with 14 additions and 12 deletions
  1. 6 5
      rtl/objpas/sysutils/sysutilh.inc
  2. 8 7
      rtl/objpas/sysutils/sysutils.inc

+ 6 - 5
rtl/objpas/sysutils/sysutilh.inc

@@ -1,3 +1,4 @@
+{%MainUnit sysutils.pp}
 {
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by Florian Klaempfl
@@ -111,15 +112,15 @@ type
     public
       constructor Create(const msg : string);
       constructor CreateFmt(const msg : string; const args : array of const);
-      constructor CreateRes(ResString: PString);
-      constructor CreateResFmt(ResString: PString; const Args: array of const);
+      constructor CreateRes(ResString: PAnsiString);
+      constructor CreateResFmt(ResString: PAnsiString; const Args: array of const);
       constructor CreateHelp(const Msg: string; AHelpContext: Longint);
       constructor CreateFmtHelp(const Msg: string; const Args: array of const;
         AHelpContext: Longint);
-      constructor CreateResHelp(ResString: PString; AHelpContext: Longint);
-      constructor CreateResFmtHelp(ResString: PString; const Args: array of const;
+      constructor CreateResHelp(ResString: PAnsiString; AHelpContext: Longint);
+      constructor CreateResFmtHelp(ResString: PAnsiString; const Args: array of const;
         AHelpContext: Longint);
-      Function ToString : String; override;
+      Function ToString : RTLString; override;
 
       function GetBaseException : Exception;virtual;
 

+ 8 - 7
rtl/objpas/sysutils/sysutils.inc

@@ -1,3 +1,4 @@
+{%MainUnit sysutils.pp}
 {
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by Florian Klaempfl
@@ -189,7 +190,7 @@ end;
       end;
 
 
-    constructor Exception.CreateRes(ResString: PString);
+    constructor Exception.CreateRes(ResString: PAnsiString);
 
       begin
          inherited create;
@@ -197,7 +198,7 @@ end;
       end;
 
 
-    constructor Exception.CreateResFmt(ResString: PString; const Args: array of const);
+    constructor Exception.CreateResFmt(ResString: PAnsiString; const Args: array of const);
 
       begin
          inherited create;
@@ -224,7 +225,7 @@ end;
     end;
 
 
-    constructor Exception.CreateResHelp(ResString: PString; AHelpContext: Longint);
+    constructor Exception.CreateResHelp(ResString: PAnsiString; AHelpContext: Longint);
 
     begin
        inherited create;
@@ -233,7 +234,7 @@ end;
     end;
 
 
-    constructor Exception.CreateResFmtHelp(ResString: PString; const Args: array of const;
+    constructor Exception.CreateResFmtHelp(ResString: PAnsiString; const Args: array of const;
       AHelpContext: Longint);
 
     begin
@@ -242,7 +243,7 @@ end;
        fhelpcontext:=AHelpContext;
     end;
 
-    Function Exception.ToString : String;
+    Function Exception.ToString : RTLString;
     begin
       Result:=ClassName+': '+Message;
     end;
@@ -348,7 +349,7 @@ type
 {$IFDEF FPC_HAS_FEATURE_RESOURCES}  // This is necessary for 2.4.4, which does not have reasources as a separate feature
     msg:  PResStringRec;
 {$else FPC_HAS_FEATURE_RESOURCES}
-    msg:  PString;
+    msg:  PAnsiString;
 {$endif FPC_HAS_FEATURE_RESOURCES}
   end;
 
@@ -408,7 +409,7 @@ Var OutOfMemory : EOutOfMemory;
 Procedure RunErrorToExcept (ErrNo : Longint; Address : CodePointer; Frame : Pointer);
 var
   E: Exception;
-  HS: PString;
+  HS: PAnsiString;
   Entry: PExceptMapEntry;
 begin
   Case Errno of