From 6b46b3082cde3a0b707d2925ca9233bba5cd5e91 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 18 Aug 2016 11:45:03 -0700 Subject: [PATCH] try, try again --- libraries/gl/src/gl/OglplusHelpers.h | 2 ++ libraries/gpu-gl/src/gpu/gl/GLState.cpp | 3 +++ .../steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp | 2 ++ 3 files changed, 7 insertions(+) diff --git a/libraries/gl/src/gl/OglplusHelpers.h b/libraries/gl/src/gl/OglplusHelpers.h index 2ed5f7b14b..fe5822c4be 100644 --- a/libraries/gl/src/gl/OglplusHelpers.h +++ b/libraries/gl/src/gl/OglplusHelpers.h @@ -35,8 +35,10 @@ #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic push +#if __GNUC__ >= 5 && __GNUC_MINOR__ >= 1 #pragma GCC diagnostic ignored "-Wsuggest-override" #endif +#endif #include diff --git a/libraries/gpu-gl/src/gpu/gl/GLState.cpp b/libraries/gpu-gl/src/gpu/gl/GLState.cpp index 6d81eb7371..b6d917b928 100644 --- a/libraries/gpu-gl/src/gpu/gl/GLState.cpp +++ b/libraries/gpu-gl/src/gpu/gl/GLState.cpp @@ -8,8 +8,11 @@ #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic push +#if __GNUC__ >= 5 && __GNUC_MINOR__ >= 1 #pragma GCC diagnostic ignored "-Wsuggest-override" #endif +#endif + #include "GLState.h" diff --git a/libraries/steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp b/libraries/steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp index 549bf69ef4..235d258d21 100644 --- a/libraries/steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp +++ b/libraries/steamworks-wrapper/src/steamworks-wrapper/SteamClient.cpp @@ -23,8 +23,10 @@ #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Woverloaded-virtual" +#if __GNUC__ >= 5 && __GNUC_MINOR__ >= 1 #pragma GCC diagnostic ignored "-Wsuggest-override" #endif +#endif #include