summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/mac_volume_catcher.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-02-22 16:44:10 -0500
committerGeenz <geenz@geenzo.com>2013-02-22 16:44:10 -0500
commite14c438ab1eb4af2644d53ede2cfb489cb38f852 (patch)
tree8b4342b2af1381e59d65cb8f8c0a5538ba4c4006 /indra/media_plugins/webkit/mac_volume_catcher.cpp
parent4a935b68151f9d6951a1d1312a3437a8e8150f41 (diff)
parent98e02a5d76ccc044e72949965e84f0803ad0026c (diff)
Merged with latest cocoa-project-viewer.
Diffstat (limited to 'indra/media_plugins/webkit/mac_volume_catcher.cpp')
-rw-r--r--indra/media_plugins/webkit/mac_volume_catcher.cpp7
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