diff options
author | Abseil Team <absl-team@google.com> | 2019-03-19 19:13:51 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-03-21 14:43:06 (GMT) |
commit | f1883b1824109338db40837bdb61f0150e395bb7 (patch) | |
tree | d2682cb7ff7c76f9f159bd92e69dfb6117dbd855 /googletest | |
parent | a4b63e7efbb276bb0a3caafa91b5c2c6a9104988 (diff) | |
download | googletest-f1883b1824109338db40837bdb61f0150e395bb7.zip googletest-f1883b1824109338db40837bdb61f0150e395bb7.tar.gz googletest-f1883b1824109338db40837bdb61f0150e395bb7.tar.bz2 |
Googletest export
Remove mention of unused type ProtocolMessage.
PiperOrigin-RevId: 239242706
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 5 | ||||
-rw-r--r-- | googletest/test/gtest_unittest.cc | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 949d1eb..d16586c 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -80,7 +80,6 @@ // Stringifies its argument. #define GTEST_STRINGIFY_(name) #name -class ProtocolMessage; namespace proto2 { class Message; } namespace testing { @@ -890,12 +889,10 @@ struct RemoveConst<const T[N]> { GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T)) // IsAProtocolMessage<T>::value is a compile-time bool constant that's -// true iff T is type ProtocolMessage, proto2::Message, or a subclass -// of those. +// true iff T is type proto2::Message or a subclass of it. template <typename T> struct IsAProtocolMessage : public bool_constant< - std::is_convertible<const T*, const ::ProtocolMessage*>::value || std::is_convertible<const T*, const ::proto2::Message*>::value> { }; diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 69d3523..4e67120 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -7146,7 +7146,7 @@ class ConversionHelperDerived : public ConversionHelperBase {}; // Tests that IsAProtocolMessage<T>::value is a compile-time constant. TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { - GTEST_COMPILE_ASSERT_(IsAProtocolMessage<ProtocolMessage>::value, + GTEST_COMPILE_ASSERT_(IsAProtocolMessage<::proto2::Message>::value, const_true); GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false); } @@ -7155,11 +7155,10 @@ TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { // proto2::Message or a sub-class of it. TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) { EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value); - EXPECT_TRUE(IsAProtocolMessage<ProtocolMessage>::value); } // 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) { EXPECT_FALSE(IsAProtocolMessage<int>::value); EXPECT_FALSE(IsAProtocolMessage<const ConversionHelperBase>::value); |