summaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
committerVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
commit3feffddd1e8381209a48c24587e36e030051499f (patch)
tree48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/src
parent53d61b5b2382891386bfd41f797118de433b358c (diff)
downloadgoogletest-3feffddd1e8381209a48c24587e36e030051499f.zip
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.bz2
Replaced all NULLs with nullptr in googlemockrefs/pull/1941/head
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-spec-builders.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 5c20ed1..0f8e8ca 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -866,7 +866,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 +879,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);
}
}