aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-17 15:45:35 -0400
committerGitHub <noreply@github.com>2018-08-17 15:45:35 -0400
commit2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8 (patch)
tree2e10880e254f2135e217dedd111ebdec2f18dd3d
parentcda442da0b6027bdaf3b37e4df1b1b280e5732ab (diff)
parente82d320567a45db1a999f9109f2b9a733bc59bb1 (diff)
downloadgoogletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.tar.gz
googletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.tar.bz2
googletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.zip
Merge branch 'master' into patch-1
-rw-r--r--googletest/docs/advanced.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index 0a92e524..3a097f1b 100644
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -572,7 +572,7 @@ namespace foo {
class Bar { // We want googletest to be able to print instances of this.
...
// Create a free inline friend function.
- friend ::std::ostream& operator<<(::std::ostream& os, const Bar& bar) {
+ friend std::ostream& operator<<(std::ostream& os, const Bar& bar) {
return os << bar.DebugString(); // whatever needed to print bar to os
}
};
@@ -580,7 +580,7 @@ class Bar { // We want googletest to be able to print instances of this.
// If you can't declare the function in the class it's important that the
// << operator is defined in the SAME namespace that defines Bar. C++'s look-up
// rules rely on that.
-::std::ostream& operator<<(::std::ostream& os, const Bar& bar) {
+std::ostream& operator<<(std::ostream& os, const Bar& bar) {
return os << bar.DebugString(); // whatever needed to print bar to os
}
@@ -601,7 +601,7 @@ namespace foo {
class Bar {
...
- friend void PrintTo(const Bar& bar, ::std::ostream* os) {
+ friend void PrintTo(const Bar& bar, std::ostream* os) {
*os << bar.DebugString(); // whatever needed to print bar to os
}
};
@@ -609,7 +609,7 @@ class Bar {
// If you can't declare the function in the class it's important that PrintTo()
// is defined in the SAME namespace that defines Bar. C++'s look-up rules rely
// on that.
-void PrintTo(const Bar& bar, ::std::ostream* os) {
+void PrintTo(const Bar& bar, std::ostream* os) {
*os << bar.DebugString(); // whatever needed to print bar to os
}