diff options
| author | Stefan Boberg <[email protected]> | 2021-10-20 19:57:41 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-20 19:57:41 +0200 |
| commit | 1a438fe2b1d7e164988cfd21874eec5bcd0cadc3 (patch) | |
| tree | 98426126223521fd29467de0a007b0e3bfd0f0f8 /zencore/include | |
| parent | zen: Improved error reporting for `print` command (diff) | |
| parent | Added missing include. (diff) | |
| download | zen-1a438fe2b1d7e164988cfd21874eec5bcd0cadc3.tar.xz zen-1a438fe2b1d7e164988cfd21874eec5bcd0cadc3.zip | |
Merge branch 'main' into gc
Diffstat (limited to 'zencore/include')
| -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/include/zencore/windows.h | 2 |
5 files changed, 9 insertions, 6 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/include/zencore/windows.h b/zencore/include/zencore/windows.h index 621621ae8..68138566b 100644 --- a/zencore/include/zencore/windows.h +++ b/zencore/include/zencore/windows.h @@ -2,6 +2,8 @@ #pragma once +#include <zencore/zencore.h> + ZEN_THIRD_PARTY_INCLUDES_START struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here" when using /permissive- |