diff options
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h | 33 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h.pump | 3 | 
2 files changed, 24 insertions, 12 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h b/googlemock/include/gmock/gmock-generated-matchers.h index 41d53048..f771f4e5 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h +++ b/googlemock/include/gmock/gmock-generated-matchers.h @@ -1405,8 +1405,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1454,8 +1455,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1509,8 +1511,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1570,8 +1573,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1638,8 +1642,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1715,8 +1720,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1796,8 +1802,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1883,8 +1890,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -1979,8 +1987,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -2081,8 +2090,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ @@ -2190,8 +2200,9 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\ diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump index 1a59fede..9b3a6e4d 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h.pump +++ b/googlemock/include/gmock/gmock-generated-matchers.h.pump @@ -647,8 +647,9 @@ $var param_field_decls2 = [[$for j       private:\        ::std::string FormatDescription(bool negation) const {\          ::std::string gmock_description = (description);\ -        if (!gmock_description.empty())\ +        if (!gmock_description.empty()) {\            return gmock_description;\ +        }\          return ::testing::internal::FormatMatcherDescription(\              negation, #name, \              ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\  | 
