aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/zen/cmds/builds_cmd.cpp9
-rw-r--r--src/zen/cmds/projectstore_cmd.cpp18
-rw-r--r--src/zen/cmds/wipe_cmd.cpp6
-rw-r--r--src/zencore/include/zencore/compactbinaryfile.h1
-rw-r--r--src/zencore/include/zencore/meta.h1
-rw-r--r--src/zencore/include/zencore/varint.h1
-rw-r--r--src/zencore/md5.cpp19
-rw-r--r--src/zencore/xmake.lua1
-rw-r--r--src/zenhttp/include/zenhttp/httpapiservice.h1
-rw-r--r--src/zenremotestore/chunking/chunkblock.cpp8
-rw-r--r--src/zenremotestore/projectstore/remoteprojectstore.cpp6
-rw-r--r--src/zenserver/storage/storageconfig.h1
-rw-r--r--src/zenstore/include/zenstore/buildstore/buildstore.h2
13 files changed, 55 insertions, 19 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 5254ef3cf..ffdc5fe48 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -67,13 +67,11 @@ ZEN_THIRD_PARTY_INCLUDES_END
static const bool DoExtraContentVerify = false;
-#define ZEN_CLOUD_STORAGE "Cloud Storage"
-
namespace zen {
using namespace std::literals;
-namespace {
+namespace builds_impl {
static std::atomic<bool> AbortFlag = false;
static std::atomic<bool> PauseFlag = false;
@@ -270,6 +268,7 @@ namespace {
static bool IsQuiet = false;
static ProgressBar::Mode ProgressMode = ProgressBar::Mode::Pretty;
+#undef ZEN_CONSOLE_VERBOSE
#define ZEN_CONSOLE_VERBOSE(fmtstr, ...) \
if (IsVerbose) \
{ \
@@ -2009,12 +2008,13 @@ namespace {
ProgressBar::SetLogOperationProgress(ProgressMode, TaskSteps::Cleanup, TaskSteps::StepCount);
}
-} // namespace
+} // namespace builds_impl
//////////////////////////////////////////////////////////////////////////////////////////////////////
BuildsCommand::BuildsCommand()
{
+ using namespace builds_impl;
m_Options.add_options()("h,help", "Print help");
auto AddSystemOptions = [this](cxxopts::Options& Ops) {
@@ -2655,6 +2655,7 @@ BuildsCommand::~BuildsCommand() = default;
void
BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace builds_impl;
ZEN_UNUSED(GlobalOptions);
signal(SIGINT, SignalCallbackHandler);
diff --git a/src/zen/cmds/projectstore_cmd.cpp b/src/zen/cmds/projectstore_cmd.cpp
index bedab3cfd..dfc6c1650 100644
--- a/src/zen/cmds/projectstore_cmd.cpp
+++ b/src/zen/cmds/projectstore_cmd.cpp
@@ -41,12 +41,10 @@ ZEN_THIRD_PARTY_INCLUDES_END
namespace zen {
-namespace {
+namespace projectstore_impl {
using namespace std::literals;
-#define ZEN_CLOUD_STORAGE "Cloud Storage"
-
void WriteAuthOptions(CbObjectWriter& Writer,
std::string_view JupiterOpenIdProvider,
std::string_view JupiterAccessToken,
@@ -500,7 +498,7 @@ namespace {
return {};
}
-} // namespace
+} // namespace projectstore_impl
///////////////////////////////////////
@@ -522,6 +520,7 @@ DropProjectCommand::~DropProjectCommand()
void
DropProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -611,6 +610,7 @@ ProjectInfoCommand::~ProjectInfoCommand()
void
ProjectInfoCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -697,6 +697,7 @@ CreateProjectCommand::~CreateProjectCommand() = default;
void
CreateProjectCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
using namespace std::literals;
@@ -766,6 +767,7 @@ CreateOplogCommand::~CreateOplogCommand() = default;
void
CreateOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
using namespace std::literals;
@@ -989,6 +991,7 @@ ExportOplogCommand::~ExportOplogCommand()
void
ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
using namespace std::literals;
ZEN_UNUSED(GlobalOptions);
@@ -1495,6 +1498,7 @@ ImportOplogCommand::~ImportOplogCommand()
void
ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
using namespace std::literals;
ZEN_UNUSED(GlobalOptions);
@@ -1788,6 +1792,7 @@ SnapshotOplogCommand::~SnapshotOplogCommand()
void
SnapshotOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
using namespace std::literals;
ZEN_UNUSED(GlobalOptions);
@@ -1852,6 +1857,7 @@ ProjectStatsCommand::~ProjectStatsCommand()
void
ProjectStatsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -1904,6 +1910,7 @@ ProjectOpDetailsCommand::~ProjectOpDetailsCommand()
void
ProjectOpDetailsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -2019,6 +2026,7 @@ OplogMirrorCommand::~OplogMirrorCommand()
void
OplogMirrorCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -2286,6 +2294,7 @@ OplogValidateCommand::~OplogValidateCommand()
void
OplogValidateCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
@@ -2437,6 +2446,7 @@ OplogDownloadCommand::~OplogDownloadCommand()
void
OplogDownloadCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace projectstore_impl;
ZEN_UNUSED(GlobalOptions);
if (!ParseOptions(argc, argv))
diff --git a/src/zen/cmds/wipe_cmd.cpp b/src/zen/cmds/wipe_cmd.cpp
index a5029e1c5..fd9e28a80 100644
--- a/src/zen/cmds/wipe_cmd.cpp
+++ b/src/zen/cmds/wipe_cmd.cpp
@@ -33,7 +33,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
namespace zen {
-namespace {
+namespace wipe_impl {
static std::atomic<bool> AbortFlag = false;
static std::atomic<bool> PauseFlag = false;
static bool IsVerbose = false;
@@ -49,6 +49,7 @@ namespace {
: GetMediumWorkerPool(EWorkloadType::Burst);
}
+#undef ZEN_CONSOLE_VERBOSE
#define ZEN_CONSOLE_VERBOSE(fmtstr, ...) \
if (IsVerbose) \
{ \
@@ -505,7 +506,7 @@ namespace {
}
return CleanWipe;
}
-} // namespace
+} // namespace wipe_impl
WipeCommand::WipeCommand()
{
@@ -532,6 +533,7 @@ WipeCommand::~WipeCommand() = default;
void
WipeCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
{
+ using namespace wipe_impl;
ZEN_UNUSED(GlobalOptions);
signal(SIGINT, SignalCallbackHandler);
diff --git a/src/zencore/include/zencore/compactbinaryfile.h b/src/zencore/include/zencore/compactbinaryfile.h
index 00c37e941..33f3e7bea 100644
--- a/src/zencore/include/zencore/compactbinaryfile.h
+++ b/src/zencore/include/zencore/compactbinaryfile.h
@@ -1,4 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
#include <zencore/compactbinary.h>
#include <zencore/iohash.h>
diff --git a/src/zencore/include/zencore/meta.h b/src/zencore/include/zencore/meta.h
index 82eb5cc30..20ec4ac6f 100644
--- a/src/zencore/include/zencore/meta.h
+++ b/src/zencore/include/zencore/meta.h
@@ -1,4 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
/* This file contains utility functions for meta programming
*
diff --git a/src/zencore/include/zencore/varint.h b/src/zencore/include/zencore/varint.h
index 9fe905f25..43ca14d38 100644
--- a/src/zencore/include/zencore/varint.h
+++ b/src/zencore/include/zencore/varint.h
@@ -1,4 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
#include "intmath.h"
diff --git a/src/zencore/md5.cpp b/src/zencore/md5.cpp
index 3baee91c2..83ed53fc8 100644
--- a/src/zencore/md5.cpp
+++ b/src/zencore/md5.cpp
@@ -342,6 +342,23 @@ Transform(uint32_t* buf, uint32_t* in)
#undef G
#undef H
#undef I
+#undef ROTATE_LEFT
+#undef S11
+#undef S12
+#undef S13
+#undef S14
+#undef S21
+#undef S22
+#undef S23
+#undef S24
+#undef S31
+#undef S32
+#undef S33
+#undef S34
+#undef S41
+#undef S42
+#undef S43
+#undef S44
namespace zen {
@@ -391,7 +408,7 @@ MD5::FromHexString(const char* string)
{
MD5 md5;
- ParseHexBytes(string, 40, md5.Hash);
+ ParseHexBytes(string, 2 * sizeof md5.Hash, md5.Hash);
return md5;
}
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 9a67175a0..2f81b7ec8 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -15,6 +15,7 @@ target('zencore')
set_configdir("include/zencore")
add_files("**.cpp")
add_files("trace.cpp", {unity_ignored = true })
+ add_files("testing.cpp", {unity_ignored = true })
if has_config("zenrpmalloc") then
add_deps("rpmalloc")
diff --git a/src/zenhttp/include/zenhttp/httpapiservice.h b/src/zenhttp/include/zenhttp/httpapiservice.h
index 0270973bf..2d384d1d8 100644
--- a/src/zenhttp/include/zenhttp/httpapiservice.h
+++ b/src/zenhttp/include/zenhttp/httpapiservice.h
@@ -1,4 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
#include <zenhttp/httpserver.h>
diff --git a/src/zenremotestore/chunking/chunkblock.cpp b/src/zenremotestore/chunking/chunkblock.cpp
index 9c3fe8a0b..f80bfc2ba 100644
--- a/src/zenremotestore/chunking/chunkblock.cpp
+++ b/src/zenremotestore/chunking/chunkblock.cpp
@@ -1037,7 +1037,7 @@ ChunkBlockAnalyser::CalculateBlockRanges(uint32_t BlockIndex,
#if ZEN_WITH_TESTS
-namespace testutils {
+namespace chunkblock_testutils {
static std::vector<std::pair<Oid, CompressedBuffer>> CreateAttachments(
const std::span<const size_t>& Sizes,
OodleCompressionLevel CompressionLevel = OodleCompressionLevel::VeryFast,
@@ -1054,14 +1054,14 @@ namespace testutils {
return Result;
}
-} // namespace testutils
+} // namespace chunkblock_testutils
TEST_SUITE_BEGIN("remotestore.chunkblock");
TEST_CASE("chunkblock.block")
{
using namespace std::literals;
- using namespace testutils;
+ using namespace chunkblock_testutils;
std::vector<std::size_t> AttachmentSizes({7633, 6825, 5738, 8031, 7225, 566, 3656, 6006, 24, 3466, 1093, 4269, 2257, 3685, 3489,
7194, 6151, 5482, 6217, 3511, 6738, 5061, 7537, 2759, 1916, 8210, 2235, 4024, 1582, 5251,
@@ -1089,7 +1089,7 @@ TEST_CASE("chunkblock.block")
TEST_CASE("chunkblock.reuseblocks")
{
using namespace std::literals;
- using namespace testutils;
+ using namespace chunkblock_testutils;
std::vector<std::vector<std::size_t>> BlockAttachmentSizes(
{std::vector<std::size_t>{7633, 6825, 5738, 8031, 7225, 566, 3656, 6006, 24, 3466, 1093, 4269, 2257, 3685, 3489,
diff --git a/src/zenremotestore/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp
index 1882f599a..570025b6d 100644
--- a/src/zenremotestore/projectstore/remoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp
@@ -4186,7 +4186,7 @@ RemoteProjectStore::~RemoteProjectStore()
#if ZEN_WITH_TESTS
-namespace testutils {
+namespace projectstore_testutils {
using namespace std::literals;
static std::string OidAsString(const Oid& Id)
@@ -4238,7 +4238,7 @@ namespace testutils {
return Result;
}
-} // namespace testutils
+} // namespace projectstore_testutils
struct ExportForceDisableBlocksTrue_ForceTempBlocksFalse
{
@@ -4265,7 +4265,7 @@ TEST_CASE_TEMPLATE("project.store.export",
ExportForceDisableBlocksFalse_ForceTempBlocksTrue)
{
using namespace std::literals;
- using namespace testutils;
+ using namespace projectstore_testutils;
ScopedTemporaryDirectory TempDir;
ScopedTemporaryDirectory ExportDir;
diff --git a/src/zenserver/storage/storageconfig.h b/src/zenserver/storage/storageconfig.h
index b408b0c26..6124cae14 100644
--- a/src/zenserver/storage/storageconfig.h
+++ b/src/zenserver/storage/storageconfig.h
@@ -1,4 +1,5 @@
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
#include "config/config.h"
diff --git a/src/zenstore/include/zenstore/buildstore/buildstore.h b/src/zenstore/include/zenstore/buildstore/buildstore.h
index 76cba05b9..bfc83ba0d 100644
--- a/src/zenstore/include/zenstore/buildstore/buildstore.h
+++ b/src/zenstore/include/zenstore/buildstore/buildstore.h
@@ -1,5 +1,5 @@
-
// Copyright Epic Games, Inc. All Rights Reserved.
+#pragma once
#include <zenstore/blockstore.h>
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-05 12:18:35 +0000