mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-12 10:09:08 +02:00
* Merging revisions r45805 from trunk:
------------------------------------------------------------------------ r45805 | michael | 2020-07-19 00:35:36 +0200 (Sun, 19 Jul 2020) | 1 line * Add TerminatedSet (delphi compatibility, bug ID #37388) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@46598 -
This commit is contained in:
parent
9f24c73119
commit
a14117e0bb
@ -116,6 +116,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -74,6 +74,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -274,6 +274,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
@ -560,6 +561,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -100,6 +100,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -99,7 +99,8 @@ end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -74,6 +74,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -74,6 +74,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -74,6 +74,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -48,6 +48,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -99,7 +99,8 @@ end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -219,6 +219,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
ThreadSwitch;
|
||||
end;
|
||||
|
||||
|
@ -364,6 +364,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -274,6 +274,13 @@ begin
|
||||
GetSuspended:=FSuspended;
|
||||
end;
|
||||
|
||||
Procedure TThread.TerminatedSet;
|
||||
|
||||
begin
|
||||
// Empty, must be overridden.
|
||||
end;
|
||||
|
||||
|
||||
|
||||
procedure TThread.AfterConstruction;
|
||||
begin
|
||||
|
@ -1752,6 +1752,7 @@ type
|
||||
protected
|
||||
FThreadID: TThreadID; // someone might need it for pthread_* calls
|
||||
procedure DoTerminate; virtual;
|
||||
procedure TerminatedSet; virtual;
|
||||
procedure Execute; virtual; abstract;
|
||||
procedure Synchronize(AMethod: TThreadMethod);
|
||||
procedure Queue(aMethod: TThreadMethod);
|
||||
@ -1840,7 +1841,7 @@ type
|
||||
property ThreadID: TThreadID read FThreadID;
|
||||
property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
|
||||
property FatalException: TObject read FFatalException;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
{ TComponent class }
|
||||
|
@ -212,7 +212,8 @@ end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -99,7 +99,8 @@ end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -253,6 +253,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -100,6 +100,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
@ -95,6 +95,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
@ -74,6 +74,7 @@ end;
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user