From c21e0e82db0a3e9a60940f7ceea74edb5a1c4122 Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 16 Jun 2010 18:25:37 +0000
Subject: patch

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49982 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/audio/linux/alsa_output.cc | 3 ++-
 media/audio/linux/alsa_output.h  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'media/audio')

diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index b4c4dd2..1b433ba 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -210,7 +210,8 @@ static void Swizzle51Layout(Format* b, uint32 filled) {
 
 }  // namespace
 
-// Not in an anonymous so that it can be a friend to AlsaPcmOutputStream.
+// Not in an anonymous namespace so that it can be a friend to
+// AlsaPcmOutputStream.
 std::ostream& operator<<(std::ostream& os,
                          AlsaPcmOutputStream::InternalState state) {
   switch (state) {
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index 5f54d3b..6a2795b 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.h
@@ -114,6 +114,7 @@ class AlsaPcmOutputStream :
 
   virtual ~AlsaPcmOutputStream();
 
+ public:  // clang workaround
   // Flags indicating the state of the stream.
   enum InternalState {
     kInError = 0,
@@ -123,6 +124,7 @@ class AlsaPcmOutputStream :
     kIsStopped,
     kIsClosed
   };
+ private:
   friend std::ostream& operator<<(std::ostream& os, InternalState);
 
   // Various tasks that complete actions started in the public API.
-- 
cgit v1.1