diff options
| author | Stefan Boberg <[email protected]> | 2026-03-04 08:35:32 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-03-04 08:35:32 +0100 |
| commit | b67dac7c093cc82b7e8f12f9eb57bfa34dfe26d8 (patch) | |
| tree | 1f5127ced9f3e8de1f24f3672403d0c97c74b1b0 /src/zencore | |
| parent | use multi range requests (#800) (diff) | |
| download | zen-b67dac7c093cc82b7e8f12f9eb57bfa34dfe26d8.tar.xz zen-b67dac7c093cc82b7e8f12f9eb57bfa34dfe26d8.zip | |
unity build fixes (#802)
Various fixes to make cpp files build in unity build mode
as an aside using Unity build doesn't really seem to work on Linux, unsure why but it leads to link-time issues
Diffstat (limited to 'src/zencore')
| -rw-r--r-- | src/zencore/include/zencore/compactbinaryfile.h | 1 | ||||
| -rw-r--r-- | src/zencore/include/zencore/meta.h | 1 | ||||
| -rw-r--r-- | src/zencore/include/zencore/varint.h | 1 | ||||
| -rw-r--r-- | src/zencore/md5.cpp | 19 | ||||
| -rw-r--r-- | src/zencore/xmake.lua | 1 |
5 files changed, 22 insertions, 1 deletions
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") |