From 0b96a91b1ca180719bd599cc14592149715ca907 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 24 May 2015 17:35:37 -0500 Subject: [PATCH] Update check to turn off warning on gcc 4.8, too. --- indra/llcommon/llallocator_heap_profile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp index df98ff28a2..b63d91caa6 100755 --- a/indra/llcommon/llallocator_heap_profile.cpp +++ b/indra/llcommon/llallocator_heap_profile.cpp @@ -27,9 +27,10 @@ // Disable some warnings on newer GCC versions. // This might also trigger on something like 4.8, but I did not such a GCC to test anything lower than 4.9 and higher than 4.6 +// It does trigger on 4.8. Not sure about 4.7. #if LL_LINUX #pragma GCC diagnostic ignored "-Wuninitialized" - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 40900 + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ ) >= 40800 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif #endif