diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 24fdf27c0b..e5c4f241b8 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -42,7 +42,7 @@ jobs: -DLLGL_VK_ENABLE_SPIRV_REFLECT=ON -DLLGL_GL_ENABLE_OPENGL2X=ON "-DLLGL_D3D11_ENABLE_FEATURELEVEL=${{ matrix.generator == 'Visual Studio 17 2022' && 'Direct3D 11.3' || 'Direct3D 11.0' }}" - "-DLLGL_D3D11_ENABLE_FEATURELEVEL=${{ matrix.generator == 'Visual Studio 17 2022' && 'Direct3D 12.2' || 'Direct3D 12.0' }}" + "-DLLGL_D3D12_ENABLE_FEATURELEVEL=${{ matrix.generator == 'Visual Studio 17 2022' && 'Direct3D 12.2' || 'Direct3D 12.0' }}" - name: Build run: | diff --git a/sources/Core/Log.cpp b/sources/Core/Log.cpp index ed3a7cc0e2..bde8ad92fb 100644 --- a/sources/Core/Log.cpp +++ b/sources/Core/Log.cpp @@ -95,7 +95,7 @@ static void PostReport(ReportType type, const char* text) { std::lock_guard guard{ g_logState.lock }; - if (auto listenerStd = g_logState.listenerStd.get()) + if (LogListener* listenerStd = g_logState.listenerStd.get()) listenerStd->Invoke(type, text); for (const auto& listener : g_logState.listeners) @@ -139,7 +139,7 @@ LLGL_EXPORT LogHandle RegisterCallbackReport(Report& report) return RegisterCallback( [](ReportType type, const char* text, void* userData) { - if (auto report = reinterpret_cast(userData)) + if (auto* report = reinterpret_cast(userData)) { if (type == ReportType::Error) report->Errorf("%s", text); @@ -172,7 +172,7 @@ LLGL_EXPORT LogHandle RegisterCallbackStd() } return reinterpret_cast(g_logState.listenerStd.get()); } - return nullptr; + return LogHandle{}; } LLGL_EXPORT void UnregisterCallback(LogHandle handle)