From 3feffddd1e8381209a48c24587e36e030051499f Mon Sep 17 00:00:00 2001
From: Vadim Barkov <vbrkov@gmail.com>
Date: Sun, 28 Oct 2018 03:27:51 +0300
Subject: Replaced all NULLs with nullptr in googlemock

---
 googlemock/src/gmock-spec-builders.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'googlemock/src')

diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 5c20ed14..0f8e8ca5 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);
   }
 }
 
-- 
cgit v1.2.3


From 80b43d900b8ed44e16b306682d47d73175cecc7f Mon Sep 17 00:00:00 2001
From: misterg <misterg@google.com>
Date: Mon, 29 Oct 2018 11:09:33 -0400
Subject: Googletest export

Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 219129336
---
 googlemock/src/gmock-spec-builders.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'googlemock/src')

diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 5c20ed14..c93b2b5d 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() {}
-- 
cgit v1.2.3