Skip to content

Commit b152038

Browse files
author
Arnaud Bouchez
committed
all: fixed compilation after previous TSynLog commit
1 parent 31e0c81 commit b152038

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/mormot.commit.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
'2.3.10794'
1+
'2.3.10795'

src/net/mormot.net.async.pas

+4-4
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ TPollAsyncSockets = class
276276
fOnFirstRead, fOnStop: TOnPollAsyncProc;
277277
fWaitingWrite: TPollAsyncConnections; // to implement soWaitWrite
278278
function GetCount: integer;
279-
procedure DoLog(const TextFmt: RawUtf8; const TextArgs: array of const;
279+
procedure DoLog(TextFmt: PUtf8Char; const TextArgs: array of const;
280280
Level: TSynLogLevel = sllTrace);
281281
// pseError: return false to close socket and connection
282282
function OnError(connection: TPollAsyncConnection;
@@ -624,7 +624,7 @@ TAsyncConnections = class(TLoggedThread)
624624
function LockedConnectionDelete(
625625
aConnection: TAsyncConnection; aIndex: integer): boolean;
626626
procedure ConnectionAdd(conn: TAsyncConnection);
627-
procedure DoLog(Level: TSynLogLevel; const TextFmt: RawUtf8;
627+
procedure DoLog(Level: TSynLogLevel; TextFmt: PUtf8Char;
628628
const TextArgs: array of const; Instance: TObject);
629629
procedure ProcessIdleTix(Sender: TObject; NowTix: Int64); virtual;
630630
function ProcessClientStart(Sender: TPollAsyncConnection): boolean;
@@ -1788,7 +1788,7 @@ function TPollAsyncSockets.GetCount: integer;
17881788
result := {$ifdef USE_WINIOCP} fIocpRecvSend {$else} fRead {$endif}.Count;
17891789
end;
17901790

1791-
procedure TPollAsyncSockets.DoLog(const TextFmt: RawUtf8;
1791+
procedure TPollAsyncSockets.DoLog(TextFmt: PUtf8Char;
17921792
const TextArgs: array of const; Level: TSynLogLevel);
17931793
begin
17941794
fDebugLog.Add.Log(Level, TextFmt, TextArgs, self);
@@ -3088,7 +3088,7 @@ function TAsyncConnections.ThreadPollingWakeup(Events: integer): PtrInt;
30883088
end;
30893089
{$endif USE_WINIOCP}
30903090

3091-
procedure TAsyncConnections.DoLog(Level: TSynLogLevel; const TextFmt: RawUtf8;
3091+
procedure TAsyncConnections.DoLog(Level: TSynLogLevel; TextFmt: PUtf8Char;
30923092
const TextArgs: array of const; Instance: TObject);
30933093
begin
30943094
if (self <> nil) and

src/orm/mormot.orm.core.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ // ! TOrmOrder = class(TOrm)
12221222
/// log the corresponding text (if logging is enabled)
12231223
procedure InternalLog(const Text: RawUtf8; Level: TSynLogLevel); overload;
12241224
/// log the corresponding text (if logging is enabled)
1225-
procedure InternalLog(const Format: RawUtf8; const Args: array of const;
1225+
procedure InternalLog(Format: PUtf8Char; const Args: array of const;
12261226
Level: TSynLogLevel = sllTrace); overload;
12271227
/// access to the associate TSynLog class type
12281228
function LogClass: TSynLogClass;

src/orm/mormot.orm.rest.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ TRestOrm = class(TRestOrmParent, IRestOrm)
492492
{$ifdef HASINLINE}inline;{$endif}
493493
procedure InternalLog(const Text: RawUtf8; Level: TSynLogLevel); overload;
494494
{$ifdef HASINLINE}inline;{$endif}
495-
procedure InternalLog(const Format: RawUtf8; const Args: array of const;
495+
procedure InternalLog(Format: PUtf8Char; const Args: array of const;
496496
Level: TSynLogLevel = sllTrace); overload;
497497
function GetServerTimestamp: TTimeLog;
498498
{$ifdef HASINLINE}inline;{$endif}
@@ -2555,7 +2555,7 @@ function TRestOrm.CacheWorthItForTable(aTableIndex: cardinal): boolean;
25552555
result := true; // always worth caching by default
25562556
end;
25572557

2558-
procedure TRestOrm.InternalLog(const Format: RawUtf8; const Args: array of const;
2558+
procedure TRestOrm.InternalLog(Format: PUtf8Char; const Args: array of const;
25592559
Level: TSynLogLevel);
25602560
begin
25612561
fRest.InternalLog(Format, Args, Level);

src/rest/mormot.rest.core.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ TRest = class(TInterfaceResolver)
533533
procedure InternalLog(const Text: RawUtf8; Level: TSynLogLevel); overload;
534534
{$ifdef HASINLINE} inline; {$endif}
535535
/// ease logging of some text in the context of the current TRest
536-
procedure InternalLog(const Format: RawUtf8; const Args: array of const;
536+
procedure InternalLog(Format: PUtf8Char; const Args: array of const;
537537
Level: TSynLogLevel = sllTrace); overload;
538538
/// ease logging of method enter/leave in the context of the current TRest
539539
function Enter(const TextFmt: RawUtf8; const TextArgs: array of const;
@@ -2057,7 +2057,7 @@ procedure TRest.InternalLog(const Text: RawUtf8; Level: TSynLogLevel);
20572057
fLogFamily.Add.Log(Level, Text, self);
20582058
end;
20592059

2060-
procedure TRest.InternalLog(const Format: RawUtf8; const Args: array of const;
2060+
procedure TRest.InternalLog(Format: PUtf8Char; const Args: array of const;
20612061
Level: TSynLogLevel);
20622062
begin
20632063
if (self <> nil) and

0 commit comments

Comments
 (0)