diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 6 | ||||
| -rw-r--r-- | testtools/source/bridgetest/multi.cxx | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index f02a6c99f4b9..16f9bd199b24 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -20,6 +20,8 @@ #include <stdio.h> #include <string.h> +#include <string_view> + #include <o3tl/any.hxx> #include <osl/diagnose.h> #include <osl/diagnose.hxx> @@ -89,8 +91,8 @@ static bool check( bool b , char const * message ) namespace { -bool checkEmpty(OUString const & string, char const * message) { - bool ok = string.isEmpty(); +bool checkEmpty(std::u16string_view string, char const * message) { + bool ok = string.empty(); if (!ok) { fprintf( stderr, "%s failed: %s\n", message, diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index ce149f154df4..4b98f92cdf22 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -27,6 +27,7 @@ #include <rtl/ustring.hxx> #include <sstream> +#include <string_view> namespace { @@ -43,7 +44,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) { s << value << " != " << argument; throw CheckFailed( OStringToOUString( - OString(s.str().c_str()), RTL_TEXTENCODING_UTF8)); + std::string_view(s.str()), RTL_TEXTENCODING_UTF8)); } } |