diff options
| author | Stefan Boberg <[email protected]> | 2021-09-06 09:21:55 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-06 09:21:55 +0200 |
| commit | 39c0d92a05a3d75e4538750c06e51368b687e454 (patch) | |
| tree | 01fb8e24270ae878ae2c7d42ac7a829044a0e398 /zencore | |
| parent | Changed so function service commits compressed buffers (diff) | |
| parent | Added zenserver-test xmake file (diff) | |
| download | zen-39c0d92a05a3d75e4538750c06e51368b687e454.tar.xz zen-39c0d92a05a3d75e4538750c06e51368b687e454.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/compactbinarypackage.cpp | 4 | ||||
| -rw-r--r-- | zencore/include/zencore/iohash.h | 2 | ||||
| -rw-r--r-- | zencore/xmake.lua | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp index 92ec3789d..7880164f9 100644 --- a/zencore/compactbinarypackage.cpp +++ b/zencore/compactbinarypackage.cpp @@ -567,7 +567,7 @@ TEST_CASE("usonpackage") CHECK_FALSE(bool(Attachment.AsObject())); CHECK_FALSE(Attachment.IsBinary()); CHECK_FALSE(Attachment.IsObject()); - CHECK(Attachment.GetHash() == IoHash::Zero); + CHECK(Attachment.GetHash() == IoHash::HashBuffer({})); TestSaveLoadValidate("Null", Attachment); } @@ -824,7 +824,7 @@ TEST_CASE("usonpackage.serialization") CHECK(bool(Package)); CHECK(Package.GetAttachments().size() == 2); CHECK(Package.GetObject().Equals(CbObject())); - CHECK(Package.GetObjectHash() == IoHash()); + CHECK(Package.GetObjectHash() == IoHash::Zero); TestSaveLoadValidate("Attachments", Package); const CbAttachment* const Object1Attachment = Package.FindAttachment(Object1.GetHash()); diff --git a/zencore/include/zencore/iohash.h b/zencore/include/zencore/iohash.h index 4a8fcd03f..aaa638684 100644 --- a/zencore/include/zencore/iohash.h +++ b/zencore/include/zencore/iohash.h @@ -25,7 +25,7 @@ class CompositeBuffer; */ struct IoHash { - alignas(uint32_t) uint8_t Hash[20]; + alignas(uint32_t) uint8_t Hash[20] = {}; static IoHash MakeFrom(const void* data /* 20 bytes */) { diff --git a/zencore/xmake.lua b/zencore/xmake.lua new file mode 100644 index 000000000..39eb4590e --- /dev/null +++ b/zencore/xmake.lua @@ -0,0 +1,6 @@ +target('zencore') + set_kind("static") + add_files("**.cpp") + add_includedirs("include", {public=true}) + add_includedirs("..\\3rdparty\\utfcpp\\source") + |