From 7d3b73c85a42811309eac26e5cbe054c40b64785 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 9 Oct 2018 14:50:26 -0400 Subject: Unconditionally use std::tuple. Remove all mention of TR1 tuple and our own implementation of tuple. PiperOrigin-RevId: 216395043 --- googlemock/include/gmock/internal/gmock-internal-utils.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index db64c65c..fd33c004 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -493,7 +493,7 @@ class StlContainerView { // This specialization is used when RawContainer is a native array // represented as a (pointer, size) tuple. template -class StlContainerView< ::testing::tuple > { +class StlContainerView< ::std::tuple > { public: typedef GTEST_REMOVE_CONST_( typename internal::PointeeOf::type) RawElement; @@ -501,11 +501,12 @@ class StlContainerView< ::testing::tuple > { typedef const type const_reference; static const_reference ConstReference( - const ::testing::tuple& array) { - return type(get<0>(array), get<1>(array), RelationToSourceReference()); + const ::std::tuple& array) { + return type(std::get<0>(array), std::get<1>(array), + RelationToSourceReference()); } - static type Copy(const ::testing::tuple& array) { - return type(get<0>(array), get<1>(array), RelationToSourceCopy()); + static type Copy(const ::std::tuple& array) { + return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy()); } }; -- cgit v1.2.3 From a50e4f05b3d84c6a014c59a24263328242cc8236 Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 24 Oct 2018 17:02:11 -0400 Subject: Googletest export Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218571466 --- googlemock/include/gmock/internal/gmock-internal-utils.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index fd33c004..7514635e 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -92,15 +92,6 @@ inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { template inline Element* GetRawPointer(Element* p) { return p; } -// This comparator allows linked_ptr to be stored in sets. -template -struct LinkedPtrLessThan { - bool operator()(const ::testing::internal::linked_ptr& lhs, - const ::testing::internal::linked_ptr& rhs) const { - return lhs.get() < rhs.get(); - } -}; - // Symbian compilation can be done with wchar_t being either a native // type or a typedef. Using Google Mock with OpenC without wchar_t // should require the definition of _STLP_NO_WCHAR_T. -- cgit v1.2.3 From b57c703963be1ca9749b902c49083beac56648aa Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 24 Oct 2018 22:04:43 -0400 Subject: Googletest export Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218618184 --- googlemock/include/gmock/internal/gmock-internal-utils.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 7514635e..fd33c004 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -92,6 +92,15 @@ inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { template inline Element* GetRawPointer(Element* p) { return p; } +// This comparator allows linked_ptr to be stored in sets. +template +struct LinkedPtrLessThan { + bool operator()(const ::testing::internal::linked_ptr& lhs, + const ::testing::internal::linked_ptr& rhs) const { + return lhs.get() < rhs.get(); + } +}; + // Symbian compilation can be done with wchar_t being either a native // type or a typedef. Using Google Mock with OpenC without wchar_t // should require the definition of _STLP_NO_WCHAR_T. -- cgit v1.2.3 From 80b43d900b8ed44e16b306682d47d73175cecc7f Mon Sep 17 00:00:00 2001 From: misterg 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/include/gmock/internal/gmock-internal-utils.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index fd33c004..7514635e 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -92,15 +92,6 @@ inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { template inline Element* GetRawPointer(Element* p) { return p; } -// This comparator allows linked_ptr to be stored in sets. -template -struct LinkedPtrLessThan { - bool operator()(const ::testing::internal::linked_ptr& lhs, - const ::testing::internal::linked_ptr& rhs) const { - return lhs.get() < rhs.get(); - } -}; - // Symbian compilation can be done with wchar_t being either a native // type or a typedef. Using Google Mock with OpenC without wchar_t // should require the definition of _STLP_NO_WCHAR_T. -- cgit v1.2.3 From e26a3fa13ca21500773293946e92ec72f8d8c9ea Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 17 Dec 2018 18:59:00 -0500 Subject: Googletest export Unifdef c++11-related macros from googletest now that it requires C++11. PiperOrigin-RevId: 225905601 --- googlemock/include/gmock/internal/gmock-internal-utils.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 7514635e..133fccef 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -528,7 +528,6 @@ struct BooleanConstant {}; // reduce code size. GTEST_API_ void IllegalDoDefault(const char* file, int line); -#if GTEST_LANG_CXX11 // Helper types for Apply() below. template struct int_pack { typedef int_pack type; }; @@ -554,7 +553,6 @@ auto Apply(F&& f, Tuple&& args) return ApplyImpl(std::forward(f), std::forward(args), make_int_pack::value>()); } -#endif #ifdef _MSC_VER -- cgit v1.2.3