summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 00:34:04 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 00:34:04 +0000
commit34f40946dab92acf2c0b25c067e14bc438c1e676 (patch)
tree236343b5e718f6f88a88946c1b8a2c4697b790f8 /gfx
parent74e3af7013e7fb3ae9a9cbd98a7fcaf8469b1b0d (diff)
downloadchromium_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 'gfx')
-rw-r--r--gfx/rect.cc4
-rw-r--r--gfx/rect.h4
-rw-r--r--gfx/size.cc4
-rw-r--r--gfx/size.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/gfx/rect.cc b/gfx/rect.cc
index 1d9be1f..e9c666c 100644
--- a/gfx/rect.cc
+++ b/gfx/rect.cc
@@ -241,8 +241,8 @@ bool Rect::SharesEdgeWith(const gfx::Rect& rect) const {
(y() == rect.bottom() || bottom() == rect.y()));
}
-} // namespace gfx
-
std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
return out << r.origin() << " " << r.size();
}
+
+} // namespace gfx
diff --git a/gfx/rect.h b/gfx/rect.h
index a07fffa..e305b9b 100644
--- a/gfx/rect.h
+++ b/gfx/rect.h
@@ -173,8 +173,8 @@ class Rect {
gfx::Size size_;
};
-} // namespace gfx
-
std::ostream& operator<<(std::ostream& out, const gfx::Rect& r);
+} // namespace gfx
+
#endif // GFX_RECT_H_
diff --git a/gfx/size.cc b/gfx/size.cc
index e39a2d7..6e5528e 100644
--- a/gfx/size.cc
+++ b/gfx/size.cc
@@ -63,8 +63,8 @@ void Size::set_height(int height) {
height_ = height;
}
-} // namespace gfx
-
std::ostream& operator<<(std::ostream& out, const gfx::Size& s) {
return out << s.width() << "x" << s.height();
}
+
+} // namespace gfx
diff --git a/gfx/size.h b/gfx/size.h
index bb45032..99896f8 100644
--- a/gfx/size.h
+++ b/gfx/size.h
@@ -75,8 +75,8 @@ class Size {
int height_;
};
-} // namespace gfx
-
std::ostream& operator<<(std::ostream& out, const gfx::Size& s);
+} // namespace gfx
+
#endif // GFX_SIZE_H_