eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Googletest export

Browse Source 
Remove mention of unused type ProtocolMessage.

PiperOrigin-RevId: 239242706
This commit is contained in:
Abseil Team 2019-03-19 15:13:51 -04:00 committed by Gennadiy Civil
parent a4b63e7efb
commit f1883b1824
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
googlemock/include/gmock/gmock-actions.h
View File

@ -773,8 +773,8 @@ class SetErrnoAndReturnAction {
// Implements the SetArgumentPointee<N>(x) action for any function // Implements the SetArgumentPointee<N>(x) action for any function
// whose N-th argument (0-based) is a pointer to x's type. The // whose N-th argument (0-based) is a pointer to x's type. The
// template parameter kIsProto is true iff type A is ProtocolMessage, // template parameter kIsProto is true iff type A is
// proto2::Message, or a sub-class of those. // proto2::Message or a sub-class of it.
template <size_t N, typename A, bool kIsProto> template <size_t N, typename A, bool kIsProto>
class SetArgumentPointeeAction { class SetArgumentPointeeAction {
public: public:
@ -798,9 +798,7 @@ template <size_t N, typename Proto>
class SetArgumentPointeeAction<N, Proto, true> { class SetArgumentPointeeAction<N, Proto, true> {
public: public:
// Constructs an action that sets the variable pointed to by the // Constructs an action that sets the variable pointed to by the
// N-th function argument to 'proto'. Both ProtocolMessage and // N-th function argument to 'proto'.
// proto2::Message have the CopyFrom() method, so the same
// implementation works for both.
explicit SetArgumentPointeeAction(const Proto& proto) : proto_(new Proto) { explicit SetArgumentPointeeAction(const Proto& proto) : proto_(new Proto) {
proto_->CopyFrom(proto); proto_->CopyFrom(proto);
} }

2
googlemock/test/gmock-internal-utils_test.cc
View File

@ -57,8 +57,6 @@
# include <sys/types.h> // For ssize_t. NOLINT # include <sys/types.h> // For ssize_t. NOLINT
#endif #endif
class ProtocolMessage;
namespace proto2 { namespace proto2 {
class Message; class Message;
} // namespace proto2 } // namespace proto2

5
googletest/include/gtest/internal/gtest-internal.h
View File

@ -80,7 +80,6 @@
// Stringifies its argument. // Stringifies its argument.
#define GTEST_STRINGIFY_(name) #name #define GTEST_STRINGIFY_(name) #name
class ProtocolMessage;
namespace proto2 { class Message; } namespace proto2 { class Message; }
namespace testing { namespace testing {
@ -890,12 +889,10 @@ struct RemoveConst<const T[N]> {
GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T)) GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
// IsAProtocolMessage<T>::value is a compile-time bool constant that's // IsAProtocolMessage<T>::value is a compile-time bool constant that's
// true iff T is type ProtocolMessage, proto2::Message, or a subclass // true iff T is type proto2::Message or a subclass of it.
// of those.
template <typename T> template <typename T>
struct IsAProtocolMessage struct IsAProtocolMessage
: public bool_constant< : public bool_constant<
std::is_convertible<const T*, const ::ProtocolMessage*>::value ||
std::is_convertible<const T*, const ::proto2::Message*>::value> { std::is_convertible<const T*, const ::proto2::Message*>::value> {
}; };

5
googletest/test/gtest_unittest.cc
View File

@ -7146,7 +7146,7 @@ class ConversionHelperDerived : public ConversionHelperBase {};
// Tests that IsAProtocolMessage<T>::value is a compile-time constant. // Tests that IsAProtocolMessage<T>::value is a compile-time constant.
TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) {
GTEST_COMPILE_ASSERT_(IsAProtocolMessage<ProtocolMessage>::value, GTEST_COMPILE_ASSERT_(IsAProtocolMessage<::proto2::Message>::value,
const_true); const_true);
GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false); GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false);
} }
@ -7155,11 +7155,10 @@ TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) {
// proto2::Message or a sub-class of it. // proto2::Message or a sub-class of it.
TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) { TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) {
EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value); EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value);
EXPECT_TRUE(IsAProtocolMessage<ProtocolMessage>::value);
} }
// Tests that IsAProtocolMessage<T>::value is false when T is neither // Tests that IsAProtocolMessage<T>::value is false when T is neither
// ProtocolMessage nor a sub-class of it. // ::proto2::Message nor a sub-class of it.
TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) { TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) {
EXPECT_FALSE(IsAProtocolMessage<int>::value); EXPECT_FALSE(IsAProtocolMessage<int>::value);
EXPECT_FALSE(IsAProtocolMessage<const ConversionHelperBase>::value); EXPECT_FALSE(IsAProtocolMessage<const ConversionHelperBase>::value);