diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 19:45:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 19:45:35 (GMT) |
commit | 2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8 (patch) | |
tree | 2e10880e254f2135e217dedd111ebdec2f18dd3d | |
parent | cda442da0b6027bdaf3b37e4df1b1b280e5732ab (diff) | |
parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
download | googletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.zip googletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.tar.gz googletest-2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8.tar.bz2 |
Merge branch 'master' into patch-1refs/pull/1652/head
-rw-r--r-- | googletest/docs/advanced.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index 0a92e52..3a097f1 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 } |