diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
| commit | 3896e3b593c332087564a767b3d8f2e7c8dbbd25 (patch) | |
| tree | 1bac50c1afdb97db255a4fbef0b33941c8025f12 /googlemock/src | |
| parent | b8a03c80ad59a4735f852ab13725f2d14ead424f (diff) | |
| parent | b9347b31c338851879d0105f0fe32d09007f0433 (diff) | |
| download | googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.gz googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.bz2 googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 5c20ed14..e8b51f6c 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -38,6 +38,7 @@ #include <stdlib.h> #include <iostream> // NOLINT #include <map> +#include <memory> #include <set> #include <string> #include <vector> @@ -848,7 +849,7 @@ void Mock::ClearDefaultActionsLocked(void* mock_obj) Expectation::Expectation() {} Expectation::Expectation( - const internal::linked_ptr<internal::ExpectationBase>& an_expectation_base) + const std::shared_ptr<internal::ExpectationBase>& an_expectation_base) : expectation_base_(an_expectation_base) {} Expectation::~Expectation() {} @@ -866,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 { @@ -879,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); } } |