livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: Quench gcc warnings in boost includes.

meow-7.2.2
Zi Ree 2023-03-26 15:49:22 +02:00
parent 5c8d7d748b
commit 88d6791ff1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmath/llcalc.cpp
View File

@ -33,6 +33,12 @@
#endif
// </FS:ND>
// <FS:Zi> More GCC specific warnings, starting with GCC12
#if defined(__GNUC__) && (__GNUC__ >= 12)
#pragma GCC diagnostic ignored "-Wdangling-pointer="
#endif
// </FS:Zi>
#include "linden_common.h"
#include "llcalc.h"

11
indra/newview/fslslpreproc.cpp
View File

@ -94,7 +94,18 @@ std::map<std::string, LLUUID> FSLSLPreprocessor::cached_assetids;
//#define BOOST_SPIRIT_THREADSAFE
#include <boost/assert.hpp>
// <FS:Zi> GCC specific warning
#if defined(__GNUC__) && (__GNUC__ >= 12)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfree-nonheap-object"
#endif
// </FS:Zi>
#include <boost/wave.hpp>
// <FS:Zi> GCC specific warning
#if defined(__GNUC__) && (__GNUC__ >= 12)
#pragma GCC diagnostic pop
#endif
// </FS:Zi>
#include <boost/wave/cpplexer/cpp_lex_token.hpp> // token class
#include <boost/wave/cpplexer/cpp_lex_iterator.hpp> // lexer class
#include <boost/wave/preprocessing_hooks.hpp>