diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
| commit | e9085769d4819f8491a5ab19e9e3813144e6aa13 (patch) | |
| tree | 55a2496790bc46370f84234d179db810926a6d95 /googlemock/src | |
| parent | 80b43d900b8ed44e16b306682d47d73175cecc7f (diff) | |
| parent | 3feffddd1e8381209a48c24587e36e030051499f (diff) | |
| download | googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.gz googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.bz2 googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.zip | |
Merge pull request #1941 from barkovv:master
PiperOrigin-RevId: 219134349
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index c93b2b5d..e8b51f6c 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -867,7 +867,7 @@ void Sequence::AddExpectation(const Expectation& expectation) const { // Creates the implicit sequence if there isn't one. InSequence::InSequence() { - if (internal::g_gmock_implicit_sequence.get() == NULL) { + if (internal::g_gmock_implicit_sequence.get() == nullptr) { internal::g_gmock_implicit_sequence.set(new Sequence); sequence_created_ = true; } else { @@ -880,7 +880,7 @@ InSequence::InSequence() { InSequence::~InSequence() { if (sequence_created_) { delete internal::g_gmock_implicit_sequence.get(); - internal::g_gmock_implicit_sequence.set(NULL); + internal::g_gmock_implicit_sequence.set(nullptr); } } |