diff options
| author | Dan Engelbrecht <[email protected]> | 2022-03-21 12:42:45 +0100 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-03-21 12:42:45 +0100 |
| commit | d35df614722024ccdb746332eceda2b7a6cd0b80 (patch) | |
| tree | 57203b27fd9fd76a62b066140a0a7cf307012eb4 /zencore | |
| parent | Missing return statement in websocket.h (diff) | |
| download | zen-d35df614722024ccdb746332eceda2b7a6cd0b80.tar.xz zen-d35df614722024ccdb746332eceda2b7a6cd0b80.zip | |
clang-format
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/compactbinary.cpp | 4 | ||||
| -rw-r--r-- | zencore/filesystem.cpp | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/iobuffer.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/refcount.h | 5 | ||||
| -rw-r--r-- | zencore/include/zencore/zencore.h | 15 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 2 | ||||
| -rw-r--r-- | zencore/thread.cpp | 6 |
7 files changed, 18 insertions, 19 deletions
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 7cc6db68a..808e4f39a 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -54,7 +54,7 @@ GetPlatformToDateTimeBiasInSeconds() #if ZEN_PLATFORM_WINDOWS const uint64_t PlatformEpochYear = 1601; #else - const uint64_t PlatformEpochYear = 1970; + const uint64_t PlatformEpochYear = 1970; #endif const uint64_t DateTimeEpochYear = 1; return uint64_t(double(PlatformEpochYear - DateTimeEpochYear) * 365.2425) * 86400; @@ -71,7 +71,7 @@ DateTime::Now() GetSystemTimeAsFileTime(&SysTime); return DateTime{(EpochBias * SecsTo100nsTicks) + (uint64_t(SysTime.dwHighDateTime) << 32) | SysTime.dwLowDateTime}; #else - int64_t SecondsSinceUnixEpoch = time(nullptr); + int64_t SecondsSinceUnixEpoch = time(nullptr); return DateTime{(EpochBias + SecondsSinceUnixEpoch) * SecsTo100nsTicks}; #endif } diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp index 79563190c..041abaf1d 100644 --- a/zencore/filesystem.cpp +++ b/zencore/filesystem.cpp @@ -707,7 +707,7 @@ ScanFile(std::filesystem::path Path, const uint64_t ChunkSize, std::function<voi ProcessFunc(ReadBuffer.data(), dwBytesRead); } #else - int Fd = open(Path.c_str(), O_RDONLY | O_CLOEXEC); + int Fd = open(Path.c_str(), O_RDONLY | O_CLOEXEC); if (Fd < 0) { return false; diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h index 449236127..bc8cfdc0f 100644 --- a/zencore/include/zencore/iobuffer.h +++ b/zencore/include/zencore/iobuffer.h @@ -70,7 +70,6 @@ ToString(ZenContentType ContentType) return "png"sv; case ZenContentType::kIcon: return "icon"sv; - } } @@ -349,7 +348,7 @@ public: /** Create a buffer which references a sequence of bytes inside another buffer */ - ZENCORE_API IoBuffer(const IoBuffer& OuterBuffer, size_t Offset, size_t SizeBytes=~0ull); + ZENCORE_API IoBuffer(const IoBuffer& OuterBuffer, size_t Offset, size_t SizeBytes = ~0ull); /** Create a buffer which references a range of bytes which we assume will live * for the entire life time. diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h index 7befbb338..32c282600 100644 --- a/zencore/include/zencore/refcount.h +++ b/zencore/include/zencore/refcount.h @@ -135,9 +135,8 @@ public: inline ~Ref() { m_Ref && m_Ref->Release(); } template<typename DerivedType> - requires DerivedFrom<DerivedType, T> inline Ref(const Ref<DerivedType>& Rhs) : Ref(Rhs.m_Ref) - { - } + requires DerivedFrom<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/zencore.h b/zencore/include/zencore/zencore.h index 60ebd0f5f..1e5689d87 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -154,7 +154,7 @@ concept DerivedFrom = std::derived_from<D, B>; template<class T> concept Integral = std::is_integral_v<T>; template<class T> -concept SignedIntegral = Integral<T>&& std::is_signed_v<T>; +concept SignedIntegral = Integral<T> && std::is_signed_v<T>; template<class T> concept UnsignedIntegral = Integral<T> && !std::is_signed_v<T>; template<class F, class... A> @@ -163,7 +163,7 @@ concept Invocable = requires(F&& f, A&&... a) std::invoke(std::forward<F>(f), std::forward<A>(a)...); }; template<class D, class B> -concept DerivedFrom = std::is_base_of_v<B, D>&& std::is_convertible_v<const volatile D*, const volatile B*>; +concept DerivedFrom = std::is_base_of_v<B, D> && std::is_convertible_v<const volatile D*, const volatile B*>; #endif #if defined(__cpp_lib_ranges) @@ -240,12 +240,13 @@ static_assert(sizeof(wchar_t) == 2, "wchar_t is expected to be two bytes in size # define ZEN_DEBUG_SECTION ZEN_CODE_SECTION(".zcold") #endif -namespace zen { -class AssertException : public std::logic_error +namespace zen { -public: - AssertException(const char* Msg) : std::logic_error(Msg) {} -}; + class AssertException : public std::logic_error + { + public: + AssertException(const char* Msg) : std::logic_error(Msg) {} + }; } // namespace zen diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 57abbfb48..e2aaa3169 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -513,7 +513,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/thread.cpp b/zencore/thread.cpp index c2ecc8d72..77b75bae3 100644 --- a/zencore/thread.cpp +++ b/zencore/thread.cpp @@ -180,7 +180,7 @@ Event::Set() #if ZEN_PLATFORM_WINDOWS SetEvent(m_EventHandle); #else - auto* Inner = (EventInner*)m_EventHandle; + auto* Inner = (EventInner*)m_EventHandle; { std::unique_lock Lock(Inner->Mutex); Inner->bSet = true; @@ -334,7 +334,7 @@ NamedEvent::Close() #if ZEN_PLATFORM_WINDOWS CloseHandle(m_EventHandle); #elif ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC - int Fd = int(intptr_t(m_EventHandle) & 0xffff'ffff); + int Fd = int(intptr_t(m_EventHandle) & 0xffff'ffff); if (flock(Fd, LOCK_EX | LOCK_NB) == 0) { @@ -599,7 +599,7 @@ ProcessHandle::Terminate(int ExitCode) bSuccess = (WaitResult != WAIT_OBJECT_0); #elif ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC ZEN_UNUSED(ExitCode); - bSuccess = (kill(m_Pid, SIGKILL) == 0); + bSuccess = (kill(m_Pid, SIGKILL) == 0); #endif if (!bSuccess) |