diff options
| author | Per Larsson <[email protected]> | 2021-11-11 15:10:08 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-11-11 15:10:08 +0100 |
| commit | b15b04b55ecfa0335c168561c61a7568538fccb8 (patch) | |
| tree | 40f68a324f081746c74c423d8c478d3da6b1b4cc /zencore | |
| parent | Handle batch requests asynchronously. (diff) | |
| parent | Format fix. (diff) | |
| download | zen-b15b04b55ecfa0335c168561c61a7568538fccb8.tar.xz zen-b15b04b55ecfa0335c168561c61a7568538fccb8.zip | |
Merge branch 'main' into zcache-batch
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/blake3.cpp | 2 | ||||
| -rw-r--r-- | zencore/compactbinary.cpp | 18 | ||||
| -rw-r--r-- | zencore/compress.cpp | 2 | ||||
| -rw-r--r-- | zencore/memory.cpp | 4 | ||||
| -rw-r--r-- | zencore/xmake.lua | 4 | ||||
| -rw-r--r-- | zencore/zencore.vcxproj | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/zencore/blake3.cpp b/zencore/blake3.cpp index 663f21b6d..8f8952271 100644 --- a/zencore/blake3.cpp +++ b/zencore/blake3.cpp @@ -7,7 +7,7 @@ #include <zencore/testing.h> #include <zencore/zencore.h> -#include "../3rdparty/BLAKE3/c/blake3.h" +#include "../thirdparty/BLAKE3/c/blake3.h" #pragma comment(lib, "blake3.lib") #include <string.h> diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index aafb365f3..c6bf38b04 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -1854,11 +1854,11 @@ TEST_CASE("uson.json") << "ValueTwo"; CbObject Obj = Writer.Save(); - StringBuilder<128> Sb; - const std::string_view JsonText = Obj.ToJson(Sb).ToView(); + StringBuilder<128> Sb; + const char* JsonText = Obj.ToJson(Sb).Data(); std::string JsonError; - json11::Json Json = json11::Json::parse(JsonText.data(), JsonError); + json11::Json Json = json11::Json::parse(JsonText, JsonError); const std::string ValueOne = Json["KeyOne"].string_value(); const std::string ValueTwo = Json["KeyTwo"].string_value(); @@ -1879,11 +1879,11 @@ TEST_CASE("uson.json") CbObject Obj = Writer.Save(); - StringBuilder<128> Sb; - const std::string_view JsonText = Obj.ToJson(Sb).ToView(); + StringBuilder<128> Sb; + const char* JsonText = Obj.ToJson(Sb).Data(); std::string JsonError; - json11::Json Json = json11::Json::parse(JsonText.data(), JsonError); + json11::Json Json = json11::Json::parse(JsonText, JsonError); const float FloatValue = float(Json["Float"].number_value()); const double DoubleValue = Json["Double"].number_value(); @@ -1904,11 +1904,11 @@ TEST_CASE("uson.json") CbObject Obj = Writer.Save(); - StringBuilder<128> Sb; - const std::string_view JsonText = Obj.ToJson(Sb).ToView(); + StringBuilder<128> Sb; + const char* JsonText = Obj.ToJson(Sb).Data(); std::string JsonError; - json11::Json Json = json11::Json::parse(JsonText.data(), JsonError); + json11::Json Json = json11::Json::parse(JsonText, JsonError); const double FloatValue = Json["FloatNan"].number_value(); const double DoubleValue = Json["DoubleNan"].number_value(); diff --git a/zencore/compress.cpp b/zencore/compress.cpp index 4a8d116fa..4b6d83f6f 100644 --- a/zencore/compress.cpp +++ b/zencore/compress.cpp @@ -8,7 +8,7 @@ #include <zencore/endian.h> #include <zencore/testing.h> -#include "../3rdparty/Oodle/include/oodle2.h" +#include "../thirdparty/Oodle/include/oodle2.h" #if ZEN_PLATFORM_WINDOWS # pragma comment(lib, "oo2core_win64.lib") #endif diff --git a/zencore/memory.cpp b/zencore/memory.cpp index 14ea7ca1d..c94829276 100644 --- a/zencore/memory.cpp +++ b/zencore/memory.cpp @@ -186,13 +186,13 @@ TEST_CASE("MemoryView") { { uint8_t Array1[16] = {}; - MemoryView View1 = MakeMemoryView(Array1); + MemoryView View1 = MakeMemoryView(Array1); CHECK(View1.GetSize() == 16); } { uint32_t Array2[16] = {}; - MemoryView View2 = MakeMemoryView(Array2); + MemoryView View2 = MakeMemoryView(Array2); CHECK(View2.GetSize() == 64); } diff --git a/zencore/xmake.lua b/zencore/xmake.lua index 0b0b51758..d26a9f922 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -2,8 +2,8 @@ target('zencore') set_kind("static") add_files("**.cpp") add_includedirs("include", {public=true}) - add_includedirs("..\\3rdparty\\utfcpp\\source") - add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64") + add_includedirs("..\\thirdparty\\utfcpp\\source") + add_linkdirs("$(projectdir)/thirdparty/BLAKE3/lib/Win64", "$(projectdir)/thirdparty/Oodle/lib/Win64") add_packages( "vcpkg::spdlog", "vcpkg::fmt", diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj index 95b9eace5..49e959b96 100644 --- a/zencore/zencore.vcxproj +++ b/zencore/zencore.vcxproj @@ -74,7 +74,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <LanguageStandard>stdcpplatest</LanguageStandard> <TreatWarningAsError>true</TreatWarningAsError> @@ -95,7 +95,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\3rdparty\utfcpp\source</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> <WholeProgramOptimization>false</WholeProgramOptimization> <LanguageStandard>stdcpplatest</LanguageStandard> <TreatWarningAsError>true</TreatWarningAsError> |