diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 00:34:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 00:34:04 +0000 |
| commit | 34f40946dab92acf2c0b25c067e14bc438c1e676 (patch) | |
| tree | 236343b5e718f6f88a88946c1b8a2c4697b790f8 /media | |
| parent | 74e3af7013e7fb3ae9a9cbd98a7fcaf8469b1b0d (diff) | |
| download | chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.zip chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.gz chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.bz2 | |
clang/mac: Fix almost all problems when building all.xcodeproj.
BUG=None
TEST=None
TBR=hans
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/clock_impl_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/clock_impl_unittest.cc b/media/base/clock_impl_unittest.cc index c23c18ec3..87f3a5e 100644 --- a/media/base/clock_impl_unittest.cc +++ b/media/base/clock_impl_unittest.cc @@ -11,12 +11,12 @@ using ::testing::InSequence; using ::testing::Return; using ::testing::StrictMock; -namespace { +namespace base { // Provide a stream output operator so we can use EXPECT_EQ(...) with TimeDelta. // // TODO(scherkus): move this into the testing package. -std::ostream& operator<<(std::ostream& stream, const base::TimeDelta& time) { +static std::ostream& operator<<(std::ostream& stream, const TimeDelta& time) { return (stream << time.ToInternalValue()); } |