Skip to content

G
googletest
Commit 936dae4e by misterg Committed by Gennadiy Civil
Options

Googletest export

Internal Change PiperOrigin-RevId: 211798074
parent 0c799d04
Showing with 12 additions and 24 deletions
googlemock/include/gmock/gmock-generated-matchers.h
...@@ -1405,9 +1405,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1405,9 +1405,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1455,9 +1454,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1455,9 +1454,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1511,9 +1509,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1511,9 +1509,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1573,9 +1570,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1573,9 +1570,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1642,9 +1638,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1642,9 +1638,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1720,9 +1715,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1720,9 +1715,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1802,9 +1796,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1802,9 +1796,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1890,9 +1883,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1890,9 +1883,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -1987,9 +1979,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -1987,9 +1979,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -2090,9 +2081,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -2090,9 +2081,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
...@@ -2200,9 +2190,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { ...@@ -2200,9 +2190,8 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
......
googlemock/include/gmock/gmock-generated-matchers.h.pump
...@@ -647,9 +647,8 @@ $var param_field_decls2 = [[$for j ...@@ -647,9 +647,8 @@ $var param_field_decls2 = [[$for j
private:\ private:\
::std::string FormatDescription(bool negation) const {\ ::std::string FormatDescription(bool negation) const {\
::std::string gmock_description = (description);\ ::std::string gmock_description = (description);\
if (!gmock_description.empty()) {\ if (!gmock_description.empty())\
return gmock_description;\ return gmock_description;\
}\
return ::testing::internal::FormatMatcherDescription(\ return ::testing::internal::FormatMatcherDescription(\
negation, #name, \ negation, #name, \
::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment