From 1ac54842e83c404315999a182b4955f6465bcb78 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Nov 2020 18:02:57 -0500
Subject: [PATCH] Remove deprecation supressions
---
indra/cmake/00-Common.cmake | 2 +-
indra/llwindow/CMakeLists.txt | 8 --------
indra/newview/llfilepicker.h | 7 -------
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 89e82ab07a5..de2181d3d4d 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -273,7 +273,7 @@ if (DARWIN)
add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
- set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef -Wno-deprecated-declarations")
+ set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}")
# NOTE: it's critical that the optimization flag is put in front.
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index b058f5f1b68..89204cbb147 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -118,14 +118,6 @@ if (DARWIN)
llopenglview-objc.h
llappdelegate-objc.h
)
-
- # We use a bunch of deprecated system APIs.
- set_source_files_properties(
- llkeyboardmacosx.cpp
- llwindowmacosx.cpp
- PROPERTIES
- COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings"
- )
endif (DARWIN)
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 947f31146a3..be66a448b9d 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -54,19 +54,12 @@
#endif
#if LL_GTK
-#if LL_GNUC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
extern "C" {
// mostly for Linux, possible on others
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
}
-#if LL_GNUC
-#pragma GCC diagnostic pop
-#endif // LL_GNUC
#endif // LL_GTK
class LLFilePicker
--
GitLab