diff options
author | David Blaikie <dblaikie@gmail.com> | 2012-01-21 18:02:01 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2012-01-21 18:02:01 +0000 |
commit | a36dda2b0ead8a8c8c43ebfff2e020c2c631d3ee (patch) | |
tree | 52a25c05a2c747c0e90d69820858a9a169ce7357 /utils/unittest | |
parent | 8608cc9473198f5e3db40f2155cb4e0c4260aaab (diff) | |
download | external_llvm-a36dda2b0ead8a8c8c43ebfff2e020c2c631d3ee.zip external_llvm-a36dda2b0ead8a8c8c43ebfff2e020c2c631d3ee.tar.gz external_llvm-a36dda2b0ead8a8c8c43ebfff2e020c2c631d3ee.tar.bz2 |
Remove unreachable defaults from gtest.
This will ensure LLVM and Clang build -Wswitch-enum-redundant-default (an on-by-default warning I'm about to add to Clang).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148639 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
-rw-r--r-- | utils/unittest/googletest/gtest-death-test.cc | 1 | ||||
-rw-r--r-- | utils/unittest/googletest/gtest.cc | 2 | ||||
-rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/utils/unittest/googletest/gtest-death-test.cc b/utils/unittest/googletest/gtest-death-test.cc index 6589385..bf7e32c 100644 --- a/utils/unittest/googletest/gtest-death-test.cc +++ b/utils/unittest/googletest/gtest-death-test.cc @@ -527,7 +527,6 @@ bool DeathTestImpl::Passed(bool status_ok) { } break; case IN_PROGRESS: - default: GTEST_LOG_(FATAL) << "DeathTest::Passed somehow called before conclusion of test"; } diff --git a/utils/unittest/googletest/gtest.cc b/utils/unittest/googletest/gtest.cc index 7624497..6538924 100644 --- a/utils/unittest/googletest/gtest.cc +++ b/utils/unittest/googletest/gtest.cc @@ -2480,8 +2480,6 @@ static const char * TestPartResultTypeToString(TestPartResult::Type type) { #else return "Failure\n"; #endif - default: - return "Unknown result type"; } } diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h b/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h index 1d9f83b..7bac2bd 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h @@ -207,8 +207,6 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status); gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \ break; \ } \ - default: \ - break; \ } \ } \ } else \ |