浏览代码

* raise takes now a void pointer as at and frame address
instead of a longint, fixed

florian 23 年之前
父节点
当前提交
106ba3fd82
共有 3 个文件被更改,包括 37 次插入6 次删除
  1. 13 1
      fcl/inc/bits.inc
  2. 9 1
      fcl/inc/lists.inc
  3. 15 4
      rtl/objpas/sysutils.inc

+ 13 - 1
fcl/inc/bits.inc

@@ -23,13 +23,21 @@ ResourceString
 Procedure BitsError (Msg : string);
 
 begin
+{$ifdef VER1_0}
   Raise EBitsError.Create(Msg) at get_caller_addr(get_frame);
+{$else VER1_0}
+  Raise EBitsError.Create(Msg) at pointer(get_caller_addr(get_frame));
+{$endif VER1_0}
 end;
 
 Procedure BitsErrorFmt (Msg : string; Args : array of const);
 
 begin
+{$ifdef VER1_0}
   Raise EBitsError.CreateFmt(Msg,args) at get_caller_addr(get_frame);
+{$else VER1_0}
+  Raise EBitsError.CreateFmt(Msg,args) at pointer(get_caller_addr(get_frame));
+{$endif VER1_0}
 end;
 
 procedure TBits.CheckBitIndex (Bit : longint;CurrentSize : Boolean);
@@ -372,7 +380,11 @@ end;
 
 {
   $Log$
-  Revision 1.6  2001-02-02 23:51:27  peter
+  Revision 1.7  2002-07-16 14:00:55  florian
+    * raise takes now a void pointer as at and frame address
+      instead of a longint, fixed
+
+  Revision 1.6  2001/02/02 23:51:27  peter
     * bit field to cardinal instead of longint
 
   Revision 1.5  2000/11/17 13:39:49  sg

+ 9 - 1
fcl/inc/lists.inc

@@ -159,7 +159,11 @@ end;
 class procedure TList.Error(const Msg: string; Data: Integer);
 
 begin
+{$ifdef VER1_0}
   Raise EListError.CreateFmt(Msg,[Data]) at get_caller_addr(get_frame);
+{$else VER1_0}
+  Raise EListError.CreateFmt(Msg,[Data]) at pointer(get_caller_addr(get_frame));
+{$endif VER1_0}
 end;
 
 procedure TList.Exchange(Index1, Index2: Integer);
@@ -427,7 +431,11 @@ end;
 
 {
   $Log$
-  Revision 1.6  2001-12-03 21:39:58  peter
+  Revision 1.7  2002-07-16 14:00:55  florian
+    * raise takes now a void pointer as at and frame address
+      instead of a longint, fixed
+
+  Revision 1.6  2001/12/03 21:39:58  peter
     * seek(int64) overload only for 1.1 compiler
 
   Revision 1.5  2001/07/17 22:07:29  sg

+ 15 - 4
rtl/objpas/sysutils.inc

@@ -242,7 +242,11 @@ begin
   else
    E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]);
   end;
+{$ifdef VER1_0}
   Raise E at longint(Address){$ifdef ENHANCEDRAISE},longint(Frame){$endif};
+{$else VER1_0}
+  Raise E at Address{$ifdef ENHANCEDRAISE},Frame){$endif};
+{$endif VER1_0}
 end;
 
 
@@ -352,7 +356,11 @@ end;
 procedure Abort;
 
 begin
-  Raise EAbort.Create(SAbortError) at Get_Caller_addr(Get_Frame)
+{$ifdef VER1_0}
+  Raise EAbort.Create(SAbortError) at Get_Caller_addr(Get_Frame);
+{$else VER1_0}
+  Raise EAbort.Create(SAbortError) at Pointer(Get_Caller_addr(Get_Frame));
+{$endif VER1_0}
 end;
 
 procedure OutOfMemoryError;
@@ -363,7 +371,11 @@ end;
 
 {
   $Log$
-  Revision 1.9  2002-01-25 17:42:03  peter
+  Revision 1.10  2002-07-16 13:57:39  florian
+    * raise takes now a void pointer as at and frame address
+      instead of a longint, fixed
+
+  Revision 1.9  2002/01/25 17:42:03  peter
     * interface helpers
 
   Revision 1.8  2002/01/25 16:23:03  peter
@@ -389,5 +401,4 @@ end;
 
   Revision 1.2  2000/08/20 15:46:46  peter
     * sysutils.pp moved to target and merged with disk.inc, filutil.inc
-
-}
+}