Skip to content

GitLab

Commit d25e6253 authored by Copybara-Service's avatar Copybara-Service
Browse files

Merge pull request #4219 from jerylvaz:main 

PiperOrigin-RevId: 524932412
Change-Id: Ie70282f7e82cb3b9442bd15bbe49bb9b00e56eb9
parents 922e0b7d 952560d3
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
googlemock/include/gmock/gmock-matchers.h
View file @ d25e6253
...@@ -5544,7 +5544,8 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage( ...@@ -5544,7 +5544,8 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
\ \
private: \ private: \
::std::string FormatDescription(bool negation) const { \ ::std::string FormatDescription(bool negation) const { \
::std::string gmock_description = (description); \ ::std::string gmock_description; \
gmock_description = (description); \
if (!gmock_description.empty()) { \ if (!gmock_description.empty()) { \
return gmock_description; \ return gmock_description; \
} \ } \
......
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