summaryrefslogtreecommitdiffstats
path: root/googleurl
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-11 20:53:37 +0100
committerKristian Monsen <kristianm@google.com>2011-05-16 13:54:48 +0100
commit21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch)
tree64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /googleurl
parent0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff)
downloadexternal_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip
external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz
external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'googleurl')
-rw-r--r--googleurl/src/gurl.cc4
-rw-r--r--googleurl/src/gurl.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/googleurl/src/gurl.cc b/googleurl/src/gurl.cc
index 3a1f2b9..e41cb71 100644
--- a/googleurl/src/gurl.cc
+++ b/googleurl/src/gurl.cc
@@ -34,6 +34,7 @@
#endif
#include <algorithm>
+#include <iostream>
#include "googleurl/src/gurl.h"
@@ -454,3 +455,6 @@ void GURL::Swap(GURL* other) {
std::swap(parsed_, other->parsed_);
}
+std::ostream& operator<<(std::ostream& out, const GURL& url) {
+ return out << url.possibly_invalid_spec();
+}
diff --git a/googleurl/src/gurl.h b/googleurl/src/gurl.h
index 4088f27..803cdfe 100644
--- a/googleurl/src/gurl.h
+++ b/googleurl/src/gurl.h
@@ -370,8 +370,6 @@ class GURL {
};
// Stream operator so GURL can be used in assertion statements.
-inline std::ostream& operator<<(std::ostream& out, const GURL& url) {
- return out << url.possibly_invalid_spec();
-}
+GURL_API std::ostream& operator<<(std::ostream& out, const GURL& url);
#endif // GOOGLEURL_SRC_GURL_H__