Reverting some changes, need to make the merge compile

This commit is contained in:
Gennadiy Civil 2018-01-15 17:36:45 -05:00
parent b9e297838d
commit 6d04de7419

View File

@ -773,7 +773,6 @@ class GTEST_API_ TestInfo {
bool is_disabled_; // True iff this test is disabled bool is_disabled_; // True iff this test is disabled
bool matches_filter_; // True if this test matches the bool matches_filter_; // True if this test matches the
// user-specified filter. // user-specified filter.
bool is_in_another_shard_; // Will be run in another shard.
internal::TestFactoryBase* const factory_; // The factory that creates internal::TestFactoryBase* const factory_; // The factory that creates
// the test object // the test object