diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-20 12:10:24 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-20 12:10:24 +0100 |
commit | ba9b26dfd843b80acbe07d647399b16a6790f8a0 (patch) | |
tree | 4c8b59d8aeae256d223c269b9412d081253a840c /platform/macos/gl_manager_macos_legacy.h | |
parent | 6d15948c68f1f0bcf150d33f5c956c152912b9d2 (diff) | |
parent | aecfd92ea81f0c3024cff56139c908ce97cdc115 (diff) |
Merge pull request #71719 from bruvzg/mac_warnings
[macOS] Move `Wno-deprecated-declarations` to pragmas in the OpenGL related files, update some deprecated code.
Diffstat (limited to 'platform/macos/gl_manager_macos_legacy.h')
-rw-r--r-- | platform/macos/gl_manager_macos_legacy.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/macos/gl_manager_macos_legacy.h b/platform/macos/gl_manager_macos_legacy.h index 663bc5ea7b..c33b803d81 100644 --- a/platform/macos/gl_manager_macos_legacy.h +++ b/platform/macos/gl_manager_macos_legacy.h @@ -33,6 +33,9 @@ #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" // OpenGL is deprecated in macOS 10.14 + #include "core/error/error_list.h" #include "core/os/os.h" #include "core/templates/local_vector.h" @@ -95,6 +98,8 @@ public: ~GLManager_MacOS(); }; +#pragma clang diagnostic push + #endif // MACOS_ENABLED && GLES3_ENABLED #endif // GL_MANAGER_MACOS_LEGACY_H |