gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1941 from barkovv:master

Browse Source 
PiperOrigin-RevId: 219134349
This commit is contained in:
Gennadiy Civil
2018-10-29 13:46:24 -04:00
parent 80b43d900b 3feffddd1e
commit e9085769d4
15 changed files with 157 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/src/gmock-spec-builders.cc
View File

@@ -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);
}
}