Skip to content

Commit 65333de

Browse files
format fix
1 parent db07545 commit 65333de

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

Scripts/Shared.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ function Find-GlslangValidator () {
186186
function Find-ClangFormat () {
187187
$repoConfiguration = Get-RepositoryConfiguration
188188
$LLVMMinimumVersion = $repoConfiguration.Requirements.LLVM.Version
189-
$LLVMMaximumVersion = $repoConfiguration.Requirements.LLVM.MaximumVersion
190189

191190
$candidates = @(
192191
'clang-format'
@@ -204,14 +203,14 @@ function Find-ClangFormat () {
204203
if ($clangFormatCommand) {
205204
if ((& $clangFormatCommand --version | Out-String) -match "clang-format version ([\d\.]*)") {
206205
[Version] $clangFormatVersion = $Matches[1]
207-
if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion) -and (CompareVersion $LLVMMaximumVersion $clangFormatVersion)) {
206+
if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion) ) {
208207
return $clangFormatCommand.Source
209208
}
210209
}
211210
}
212211
}
213212

214-
throw "Failed to find clang-format min $LLVMMinimumVersion max $LLVMMaximumVersion. Tried: " + ($candidates -join ', ')
213+
throw "Failed to find clang-format min $LLVMMinimumVersion. Tried: " + ($candidates -join ', ')
215214
}
216215

217216
function Setup-ShaderCCompilerTool () {

ZEngine/ZEngine/Core/CoroutineScheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ZEngine::Core
1515
ReadyCallback Ready = nullptr;
1616
ExecuteCallback Action = nullptr;
1717

18-
operator bool() noexcept
18+
operator bool() noexcept
1919
{
2020
return (Ready && Action);
2121
}

ZEngine/ZEngine/Hardwares/VulkanDevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace ZEngine::Hardwares
7272
VkBuffer Handle = VK_NULL_HANDLE;
7373
VmaAllocation Allocation = nullptr;
7474

75-
operator bool() const
75+
operator bool() const
7676
{
7777
return (Handle != VK_NULL_HANDLE);
7878
}
@@ -86,7 +86,7 @@ namespace ZEngine::Hardwares
8686
VkSampler Sampler{VK_NULL_HANDLE};
8787
VmaAllocation Allocation{nullptr};
8888

89-
operator bool() const
89+
operator bool() const
9090
{
9191
return (Handle != VK_NULL_HANDLE);
9292
}

0 commit comments

Comments
 (0)