Pārlūkot izejas kodu

* an exception does not need to inherit from Exception, so declare that as such for the thread queue entry for the sake of clarity

git-svn-id: trunk@40652 -
svenbarth 6 gadi atpakaļ
vecāks
revīzija
81fa0924d8
2 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 2 2
      rtl/objpas/classes/classes.inc
  2. 1 1
      rtl/objpas/classes/classesh.inc

+ 2 - 2
rtl/objpas/classes/classes.inc

@@ -462,7 +462,7 @@ function CheckSynchronize(timeout : longint=0) : boolean;
 
 
 { assumes being called from GUI thread }
 { assumes being called from GUI thread }
 var
 var
-  ExceptObj: Exception;
+  ExceptObj: TObject;
   tmpentry: TThread.PThreadQueueEntry;
   tmpentry: TThread.PThreadQueueEntry;
 
 
 begin
 begin
@@ -486,7 +486,7 @@ begin
     try
     try
       ExecuteThreadQueueEntry(tmpentry);
       ExecuteThreadQueueEntry(tmpentry);
     except
     except
-      exceptobj := Exception(AcquireExceptionObject);
+      exceptobj := TObject(AcquireExceptionObject);
     end;
     end;
     { step 3: error handling and cleanup }
     { step 3: error handling and cleanup }
     if Assigned(tmpentry^.SyncEvent) then
     if Assigned(tmpentry^.SyncEvent) then

+ 1 - 1
rtl/objpas/classes/classesh.inc

@@ -1635,7 +1635,7 @@ type
       //ThreadProc: TThreadProcedure;
       //ThreadProc: TThreadProcedure;
       Thread: TThread;
       Thread: TThread;
       ThreadID: TThreadID;
       ThreadID: TThreadID;
-      Exception: Exception;
+      Exception: TObject;
       SyncEvent: PRtlEvent;
       SyncEvent: PRtlEvent;
       Next: PThreadQueueEntry;
       Next: PThreadQueueEntry;
     end;
     end;