diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-07-18 11:17:19 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-07-18 11:17:19 -0400 |
| commit | 7e73a7ae6e665e3a9e34543090625ab8278412bb (patch) | |
| tree | 9a172c4aa4023fdcac3c7a5840e80f1eea6697a5 | |
| parent | 20ef7944a410c5e01a35156b784266615d5ad38c (diff) | |
| download | googletest-7e73a7ae6e665e3a9e34543090625ab8278412bb.tar.gz googletest-7e73a7ae6e665e3a9e34543090625ab8278412bb.tar.bz2 googletest-7e73a7ae6e665e3a9e34543090625ab8278412bb.zip | |
Formatting and a link
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index fe0d9e84..af8240e6 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -32,7 +32,7 @@ // ============================================================ // // Adds google3 callback support to CallableTraits. -// + #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ #endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index d5ec0864..bc35c34c 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1218,7 +1218,7 @@ class scoped_ptr { // Defines RE. #if GTEST_USES_PCRE -using ::RE; +// if used, PCRE is injected by custom/gtest-port.h #elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE // A simple C++ wrapper for <regex.h>. It uses the POSIX Extended diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 9c25c997..26a37107 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -5273,7 +5273,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { // each TestCase and TestInfo object. // If shard_tests == true, further filters tests based on sharding // variables in the environment - see -// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md +// https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md // . Returns the number of tests that should run. int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? |