diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
| commit | 091185b057d312e05f6b7ec7d03a37dec0879adf (patch) | |
| tree | 48d4d4b4d3c1b02e40f9b029cf65bb200687f087 /indra/mac_updater/mac_updater.cpp | |
| parent | a0ac409e8a4a822a55e9079b4a6d947af5edf220 (diff) | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
Merge
Diffstat (limited to 'indra/mac_updater/mac_updater.cpp')
| -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 |