diff options
| author | Per Larsson <[email protected]> | 2021-10-20 15:48:57 +0200 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-10-20 15:48:57 +0200 |
| commit | 724639b172b17f7d6ea6f57df4740ade47e6450c (patch) | |
| tree | ddb757867401aad1d18acfeb874f9bd8ee0590d6 | |
| parent | zen server: Added root manifest, with support for explicit schema versioning (diff) | |
| download | zen-724639b172b17f7d6ea6f57df4740ade47e6450c.tar.xz zen-724639b172b17f7d6ea6f57df4740ade47e6450c.zip | |
Format fix.
| -rw-r--r-- | zencore/include/zencore/fmtutils.h | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/iobuffer.h | 5 | ||||
| -rw-r--r-- | zencore/include/zencore/refcount.h | 5 | ||||
| -rw-r--r-- | zencore/include/zencore/string.h | 2 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 2 | ||||
| -rw-r--r-- | zencore/string.cpp | 4 | ||||
| -rw-r--r-- | zenhttp/httpasio.cpp | 2 | ||||
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 2 | ||||
| -rw-r--r-- | zenserver/diag/formatters.h | 2 | ||||
| -rw-r--r-- | zenserver/experimental/usnjournal.h | 2 |
10 files changed, 14 insertions, 13 deletions
diff --git a/zencore/include/zencore/fmtutils.h b/zencore/include/zencore/fmtutils.h index 7e60c2bef..70867fe72 100644 --- a/zencore/include/zencore/fmtutils.h +++ b/zencore/include/zencore/fmtutils.h @@ -6,7 +6,6 @@ #include <zencore/string.h> #include <zencore/uid.h> - ZEN_THIRD_PARTY_INCLUDES_START #include <fmt/format.h> ZEN_THIRD_PARTY_INCLUDES_END diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h index 8679511c9..88a72cbba 100644 --- a/zencore/include/zencore/iobuffer.h +++ b/zencore/include/zencore/iobuffer.h @@ -358,7 +358,10 @@ public: [[nodiscard]] ZENCORE_API bool GetFileReference(IoBufferFileReference& OutRef) const; template<typename T> - [[nodiscard]] const T* Data() const { return reinterpret_cast<const T*>(m_Core->DataPointer()); } + [[nodiscard]] const T* Data() const + { + return reinterpret_cast<const T*>(m_Core->DataPointer()); + } private: RefPtr<IoBufferCore> m_Core = new IoBufferCore; diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h index 1873ce48e..7167ab3b5 100644 --- a/zencore/include/zencore/refcount.h +++ b/zencore/include/zencore/refcount.h @@ -117,9 +117,8 @@ public: inline ~Ref() { m_Ref && m_Ref->Release(); } template<typename DerivedType> - requires std::derived_from<DerivedType, T> inline Ref(const Ref<DerivedType>& Rhs) : Ref(Rhs.m_Ref) - { - } + requires std::derived_from<DerivedType, T> + inline Ref(const Ref<DerivedType>& Rhs) : Ref(Rhs.m_Ref) {} [[nodiscard]] inline bool IsNull() const { return m_Ref == nullptr; } inline explicit operator bool() const { return m_Ref != nullptr; } diff --git a/zencore/include/zencore/string.h b/zencore/include/zencore/string.h index 630341056..a5ab25068 100644 --- a/zencore/include/zencore/string.h +++ b/zencore/include/zencore/string.h @@ -650,7 +650,7 @@ ToLower(const std::string_view& InString) for (char& CurChar : Out) { - CurChar -= (uint8_t(CurChar - 'A') <= ('Z' - 'A')) * ('A' - 'a'); // this should be compiled into branchless logic + CurChar -= (uint8_t(CurChar - 'A') <= ('Z' - 'A')) * ('A' - 'a'); // this should be compiled into branchless logic } return Out; diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 6cee3f60d..7077942bf 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -500,7 +500,7 @@ IoBufferBuilder::MakeFromTemporaryFile(const std::filesystem::path& FileName) Handle = DataFile.Detach(); #else - int Fd = open(FileName.native().c_str(), O_RDONLY); + int Fd = open(FileName.native().c_str(), O_RDONLY); if (Fd < 0) { return {}; diff --git a/zencore/string.cpp b/zencore/string.cpp index 43381aa5d..b7670617f 100644 --- a/zencore/string.cpp +++ b/zencore/string.cpp @@ -936,9 +936,9 @@ TEST_CASE("string") CHECK(HashStringAsLowerDjb2("aBCd"sv) == HashStringDjb2(ToLower("aBCd"sv))); } - SUBCASE("tolower") + SUBCASE("tolower") { - CHECK_EQ(ToLower("te!st"sv), "te!st"sv); + CHECK_EQ(ToLower("te!st"sv), "te!st"sv); CHECK_EQ(ToLower("TE%St"sv), "te%st"sv); } diff --git a/zenhttp/httpasio.cpp b/zenhttp/httpasio.cpp index ce6503a96..ea84e7e87 100644 --- a/zenhttp/httpasio.cpp +++ b/zenhttp/httpasio.cpp @@ -35,7 +35,7 @@ inline spdlog::logger& InitLogger() { spdlog::logger& Logger = logging::Get("asio"); - //Logger.set_level(spdlog::level::trace); + // Logger.set_level(spdlog::level::trace); return Logger; } diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index fec6ca17c..6da60aa06 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1036,7 +1036,7 @@ TEST_CASE("project.basic") zen::CbObject Op = OpWriter.Save(); - zen::CbPackage OpPackage(Op); + zen::CbPackage OpPackage(Op); OpPackage.AddAttachment(Attach); zen::BinaryWriter MemOut; diff --git a/zenserver/diag/formatters.h b/zenserver/diag/formatters.h index d55765612..42f928efe 100644 --- a/zenserver/diag/formatters.h +++ b/zenserver/diag/formatters.h @@ -3,8 +3,8 @@ #pragma once ZEN_THIRD_PARTY_INCLUDES_START -#include <fmt/format.h> #include <cpr/cpr.h> +#include <fmt/format.h> ZEN_THIRD_PARTY_INCLUDES_END template<> diff --git a/zenserver/experimental/usnjournal.h b/zenserver/experimental/usnjournal.h index 688823953..db1f59abc 100644 --- a/zenserver/experimental/usnjournal.h +++ b/zenserver/experimental/usnjournal.h @@ -2,8 +2,8 @@ #pragma once -#include <zencore/zencore.h> #include <zencore/windows.h> +#include <zencore/zencore.h> ZEN_THIRD_PARTY_INCLUDES_START #include <winioctl.h> |