paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 04:29:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-base: fixed compile fpthreadpool with fpc 3.2.2

Browse Source
This commit is contained in:
mattias 2022-02-23 13:39:57 +01:00
parent 3e9ddf59df
commit 93f2bd48dd
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/fcl-base/src/fpthreadpool.pp
View File

@ -135,6 +135,9 @@ Type
procedure TerminatedSet; override;
procedure DoSetTask(AValue: TThreadPoolTask); virtual;
Public
{$IF FPC_FULLVERSION<30300}
procedure Terminate;
{$ENDIF}
Procedure FreeTask;
Property Task : TThreadPoolTask Read FTask Write SetTask;
end;
@ -308,6 +311,7 @@ Procedure DoLog(Const Fmt : String; Const Args : Array of const);
begin
DoLog(Format(Fmt,Args))
end;
{$ENDIF}
{ TFPCustomSimpleThreadPool.TAbstractThreadList }
@ -317,7 +321,6 @@ begin
FPool:=aPool;
end;
{ TFPCustomSimpleThreadPool.TAutoCheckQueueThread }
constructor TFPCustomSimpleThreadPool.TAutoCheckQueueThread.Create(aPool: TFPCustomSimpleThreadPool; aInterval: Integer);
@ -557,6 +560,14 @@ begin
FTask:=AValue;
end;
{$IF FPC_FULLVERSION<30300}
procedure TFPCustomSimpleThreadPool.TAbstractTaskThread.Terminate;
begin
inherited Terminate;
TerminatedSet;
end;
{$ENDIF}
procedure TFPCustomSimpleThreadPool.TAbstractTaskThread.FreeTask;
begin
FreeAndNil(FTask);
@ -566,7 +577,6 @@ procedure TFPCustomSimpleThreadPool.TAbstractTaskThread.TerminatedSet;
begin
if Assigned(FTask) then
FTask.Terminate;
inherited TerminatedSet;
end;
{ TThreadPoolTask }
@ -610,7 +620,6 @@ procedure TThreadPoolTask.Execute;
Var
RunOK : Boolean;
S : String;
begin
RunOK:=False;
@ -795,11 +804,9 @@ function TFPCustomSimpleThreadPool.DoAddTask(aTask: TThreadPoolTask) : Boolean;
Var
T : TAbstractTaskThread;
WaitStart : TDateTime;
TimeOut : Boolean;
begin
WaitStart:=0;
Result:=False;
TimeOut:=False;
Repeat