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/media_plugins/webkit/mac_volume_catcher.cpp | |
parent | e17d69d1d16c607aa304936ebf2ab151684f9c76 (diff) | |
parent | 27b01e94dd7e98415fa8ec645c37f9291f60df0b (diff) |
Merge new boost and add OS X 10.8 mods
Diffstat (limited to 'indra/media_plugins/webkit/mac_volume_catcher.cpp')
-rw-r--r-- | indra/media_plugins/webkit/mac_volume_catcher.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/mac_volume_catcher.cpp b/indra/media_plugins/webkit/mac_volume_catcher.cpp index 2f3f2211a3..cc94556413 100644 --- a/indra/media_plugins/webkit/mac_volume_catcher.cpp +++ b/indra/media_plugins/webkit/mac_volume_catcher.cpp @@ -38,6 +38,10 @@ #include <QuickTime/QuickTime.h> #include <AudioUnit/AudioUnit.h> +#if LL_DARWIN +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + struct VolumeCatcherStorage; class VolumeCatcherImpl @@ -265,3 +269,6 @@ void VolumeCatcher::pump() // No periodic tasks are necessary for this implementation. } +#if LL_DARWIN +#pragma GCC diagnostic warning "-Wdeprecated-declarations" +#endif |