diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-05-23 15:15:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 15:15:50 (GMT) |
| commit | 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 (patch) | |
| tree | 4a2d3a55fe9a6117f12922522adc91057226c437 /googletest/src | |
| parent | 145d05750b15324899473340c8dd5af50d125d33 (diff) | |
| parent | 28c91e2cea88ee6ddc0e0dc6ca18b8e86f85d80c (diff) | |
| download | googletest-4e4df226fc197c0dda6e37f5c8c3845ca1e73a49.zip googletest-4e4df226fc197c0dda6e37f5c8c3845ca1e73a49.tar.gz googletest-4e4df226fc197c0dda6e37f5c8c3845ca1e73a49.tar.bz2 | |
Merge pull request #1607 from gennadiycivil/master
Formatting changes
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest-all.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-printers.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-test-part.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/googletest/src/gtest-all.cc b/googletest/src/gtest-all.cc index 0a9cee5..5872a2e 100644 --- a/googletest/src/gtest-all.cc +++ b/googletest/src/gtest-all.cc @@ -29,7 +29,7 @@ // // Author: mheule@google.com (Markus Heule) // -// Google C++ Testing Framework (Google Test) +// Google C++ Testing and Mocking Framework (Google Test) // // Sometimes it's desirable to build Google Test by compiling a single file. // This file serves this purpose. diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 4b721a4..b397992 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -184,7 +184,7 @@ bool KilledBySignal::operator()(int exit_status) const { # endif // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_; } -# endif // !GTEST_OS_WINDOWS +# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA namespace internal { diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index d55a5e9..eeba17f 100644 --- a/googletest/src/gtest-printers.cc +++ b/googletest/src/gtest-printers.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -// Google Test - The Google C++ Testing Framework +// Google Test - The Google C++ Testing and Mocking Framework // // This file implements a universal value printer that can print a // value of any type T: diff --git a/googletest/src/gtest-test-part.cc b/googletest/src/gtest-test-part.cc index c3926c8..4c5f2e3 100644 --- a/googletest/src/gtest-test-part.cc +++ b/googletest/src/gtest-test-part.cc @@ -29,7 +29,7 @@ // // Author: mheule@google.com (Markus Heule) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) #include "gtest/gtest-test-part.h" #include "src/gtest-internal-inl.h" diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 1b2aad2..5406392 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) #include "gtest/gtest.h" #include "gtest/internal/custom/gtest.h" |