diff options
author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
---|---|---|
committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
commit | 98e02a5d76ccc044e72949965e84f0803ad0026c (patch) | |
tree | 49df15d88f940e9901c618eacc9e2286cccb6952 /indra/mac_updater | |
parent | e17d69d1d16c607aa304936ebf2ab151684f9c76 (diff) | |
parent | 27b01e94dd7e98415fa8ec645c37f9291f60df0b (diff) |
Merge new boost and add OS X 10.8 mods
Diffstat (limited to 'indra/mac_updater')
-rw-r--r-- | indra/mac_updater/mac_updater.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index aa45c5d23f..f533d47b18 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -47,6 +47,11 @@ #include "llerrorcontrol.h" +#if LL_DARWIN +// FSPathMakeRef, FSObjectCopy, deprecations... +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + enum { kEventClassCustom = 'Cust', @@ -1255,3 +1260,7 @@ void *updatethreadproc(void*) return(NULL); } + +#if LL_DARWIN +#pragma GCC diagnostic warning "-Wdeprecated-declarations" +#endif |