diff options
| author | Stefan Boberg <[email protected]> | 2021-09-21 14:17:33 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-21 14:17:33 +0200 |
| commit | 30bf50a347c2da69cc2361830f9385c720ac521d (patch) | |
| tree | d57b181543a0bd1330c4a8629a765cff4b182a22 | |
| parent | Wired up scrubbing to more higher level services (diff) | |
| parent | Clang format fix. (diff) | |
| download | zen-30bf50a347c2da69cc2361830f9385c720ac521d.tar.xz zen-30bf50a347c2da69cc2361830f9385c720ac521d.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
| -rw-r--r-- | zencore/mpscqueue.cpp | 2 | ||||
| -rw-r--r-- | zenhttp/httpsys.cpp | 2 | ||||
| -rw-r--r-- | zenserver/cache/structuredcache.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/zencore/mpscqueue.cpp b/zencore/mpscqueue.cpp index e1841ef63..29c76c3ca 100644 --- a/zencore/mpscqueue.cpp +++ b/zencore/mpscqueue.cpp @@ -7,7 +7,7 @@ namespace zen { -#if ZEN_WITH_TESTS && 0 +#if ZEN_WITH_TESTS && 0 TEST_CASE("mpsc") { MpscQueue<std::string> Queue; diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp index cc56b484f..28a9f7abf 100644 --- a/zenhttp/httpsys.cpp +++ b/zenhttp/httpsys.cpp @@ -1256,7 +1256,7 @@ InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesT case ERROR_OPERATION_ABORTED: return nullptr; - case ERROR_MORE_DATA: // Insufficient buffer space + case ERROR_MORE_DATA: // Insufficient buffer space case NO_ERROR: break; } diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 533fea498..720323f13 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -173,7 +173,7 @@ HttpStructuredCacheService::Flush() { } -void +void HttpStructuredCacheService::Scrub(ScrubContext& Ctx) { if (m_LastScrubTime == Ctx.ScrubTimestamp()) |