diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-15 17:36:45 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-15 17:36:45 -0500 |
| commit | 6d04de7419a722e382c0445db88a7f749f6087d6 (patch) | |
| tree | 2d199a063900d53ab07030c3c75ef4b5cd2ac17c | |
| parent | b9e297838daa46cbfc8cfef58fe4c4c3cc8c0d68 (diff) | |
| download | googletest-6d04de7419a722e382c0445db88a7f749f6087d6.tar.gz googletest-6d04de7419a722e382c0445db88a7f749f6087d6.tar.bz2 googletest-6d04de7419a722e382c0445db88a7f749f6087d6.zip | |
Reverting some changes, need to make the merge compile
| -rw-r--r-- | googletest/include/gtest/gtest.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 3eeaf6fb..8326fa5d 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -773,7 +773,6 @@ class GTEST_API_ TestInfo { bool is_disabled_; // True iff this test is disabled bool matches_filter_; // True if this test matches the // user-specified filter. - bool is_in_another_shard_; // Will be run in another shard. internal::TestFactoryBase* const factory_; // The factory that creates // the test object |