diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-31 10:54:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-31 10:54:18 +0100 |
| commit | eedc4553b58d8f93be8297085f401fdb868b5725 (patch) | |
| tree | d11d484f4c0bdc43a4e777965b550ec137dd7222 /platform/windows | |
| parent | d14d6033a5fe9fbe7e20070bd4cda67cef745e57 (diff) | |
| parent | f8be889133b48436309d5af8fb887357b8a38aa6 (diff) | |
Merge pull request #72426 from fire/4-warnings
Fixed a few godot engine 4 warnings on clang with Opengl and Windows …
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/gl_manager_windows.h | 1 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/platform/windows/gl_manager_windows.h b/platform/windows/gl_manager_windows.h index b97d0f667c..361c559a5a 100644 --- a/platform/windows/gl_manager_windows.h +++ b/platform/windows/gl_manager_windows.h @@ -74,7 +74,6 @@ private: GLWindow *_current_window = nullptr; PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = nullptr; - PFNWGLGETSWAPINTERVALEXTPROC wglGetSwapIntervalEXT = nullptr; // funcs void _internal_set_current_window(GLWindow *p_win); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 08299d9b98..d384049fb5 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -830,7 +830,7 @@ class FallbackTextAnalysisSource : public IDWriteTextAnalysisSource { IDWriteNumberSubstitution *n_sub = nullptr; public: - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, VOID **ppvInterface) { + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, VOID **ppvInterface) override { if (IID_IUnknown == riid) { AddRef(); *ppvInterface = (IUnknown *)this; @@ -844,11 +844,11 @@ public: return S_OK; } - ULONG STDMETHODCALLTYPE AddRef() { + ULONG STDMETHODCALLTYPE AddRef() override { return InterlockedIncrement(&_cRef); } - ULONG STDMETHODCALLTYPE Release() { + ULONG STDMETHODCALLTYPE Release() override { ULONG ulRef = InterlockedDecrement(&_cRef); if (0 == ulRef) { delete this; |