diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-02-01 14:17:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-02-01 19:03:36 +0100 |
| commit | 07d04fd3ae72dc1c9998f83a4131407ecc39cda9 (patch) | |
| tree | 631096befc3ac2c7da3ce8af84cce3c604ff21ce /test | |
| parent | 3430192b9c9cc04f7aa46329c84b667f93c9ef39 (diff) | |
Better fix for missing [[noreturn]] of CPPUNIT_FAIL
This includes a revert of commit 9808486a89c6368f836579f8d8c0dda63fd0063c "Avoid
-Werror,-Wimplicit-fallthrough with clang-cl", and also undoes older MSVC
workarounds (that would start to cause "warning C4702: unreachable code" now).
Change-Id: If72bf336e12e0a2db589857e8875003dae861977
Reviewed-on: https://gerrit.libreoffice.org/67248
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/xmltesttools.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index b104599f4b9d..7fd6a4ee9e0d 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -11,7 +11,6 @@ #include <memory> -#include <o3tl/unreachable.hxx> #include <vcl/mtfxmldump.hxx> namespace { @@ -97,7 +96,6 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath) { case XPATH_UNDEFINED: CPPUNIT_FAIL("Undefined XPath type"); - O3TL_UNREACHABLE; case XPATH_NODESET: { xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; @@ -132,7 +130,6 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath) } CPPUNIT_FAIL("Invalid XPath type"); - return OUString(); // to suppress "Not all control paths return a value" warning on MSVC } void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const OString& rAttribute, const OUString& rExpectedValue) |