diff options
| author | Arseny Aprelev <arseny.aprelev@gmail.com> | 2018-10-01 20:47:09 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-02 17:03:28 (GMT) |
| commit | 00938b2b228f3b70d3d9e51f29a1505bdad43f1e (patch) | |
| tree | 2bebc032627672911353925d14d1fce101a36029 /googletest/include/gtest/internal | |
| parent | 2e91bbcf6f33eb85451001be2d4c95cca86ea9fc (diff) | |
| download | googletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.zip googletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.tar.gz googletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.tar.bz2 | |
Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d19aa373b428c7c746f951737354c28
Closes #1544
With refinements and changes
PiperOrigin-RevId: 215273083
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index b762f61..380a11c 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -1208,7 +1208,10 @@ class NativeArray { #define GTEST_SUCCESS_(message) \ GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess) -// Suppress MSVC warning 4702 (unreachable code) for the code following +#define GTEST_SKIP_(message) \ + return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip) + +// Suppress MSVC warning 4072 (unreachable code) for the code following // statement if it returns or throws (or doesn't return or throw in some // situations). #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ |