Replace VALID_CONVERSION macro with function

Desktop / LibreOffice - Stephan Bergmann [redhat.com] - 7 June 2016 06:36 UTC

...to avoid bogus -Werror=unused-result from trunk GCC in the macro expansion.

Change-Id: I227a0edfb22255c31d285609761dbefb4e50e09a Reviewed-on: https://gerrit.libreoffice.org/26004

###

diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 825e7d8..ff43000 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -14,6 +14,10 @@ extern bool rtl_string_unittest_invalid_conversion;
extern bool rtl_string_unittest_const_literal_function;
extern bool rtl_string_unittest_non_const_literal_function;

+#include
+
+#include
+
#include
#include
#include
@@ -49,12 +53,20 @@ CPPUNIT_TEST_SUITE_END();

// reset the flag, evaluate the expression and return
// whether the string literal ctor was used (i.e. whether the conversion was valid)
-#define VALID_CONVERSION( expression ) \
- ( \
- rtl_string_unittest_invalid_conversion = false, \
- ( void ) rtl::OUString( expression ), \
- ( void ) rtl::OUStringBuffer( expression ), \
- !rtl_string_unittest_invalid_conversion )
+template bool VALID_CONVERSION( T && expression )
+{
+ rtl_string_unittest_invalid_conversion = false;
+ ( void ) rtl::OUString( std::forward(expression) );
+ ( void ) rtl::OUStringBuffer( std::forward(expression) );
+ return !rtl_string_unittest_invalid_conversion;
+}
+template bool VALID_CONVERSION_CALL( T f )
+{
+ rtl_string_unittest_invalid_conversion = false;
+ ( void ) rtl::OUString( f() );
+ ( void ) rtl::OUStringBuffer( f() );
+ return !rtl_string_unittest_invalid_conversion;
+}

void test::oustring::StringLiterals::checkCtors()
{
@@ -93,7 +105,8 @@ void test::oustring::StringLiterals::checkCtors()

void test::oustring::StringLiterals::testcall( const char str[] )
{
- CPPUNIT_ASSERT( !VALID_CONVERSION( rtl::OUString( str )));
+ CPPUNIT_ASSERT(
+ !VALID_CONVERSION_CALL([&str]() { return rtl::OUString(str); }));
}

void test::oustring::StringLiterals::checkUsage()
@@ -154,9 +167,18 @@ void test::oustring::StringLiterals::checkNonconstChar()
char bar[] = "bar";
const char consttest[] = "test";
const char constbar[] = "bar";
- CPPUNIT_ASSERT( !VALID_CONVERSION( rtl::OUString( "footest" ).replaceAll( test, bar )));
- CPPUNIT_ASSERT( !VALID_CONVERSION( rtl::OUString( "footest" ).replaceAll( consttest, bar )));
- CPPUNIT_ASSERT( !VALID_CONVERSION( rtl::OUString( "footest" ).replaceAll( test, constbar )));
+ CPPUNIT_ASSERT(
+ !VALID_CONVERSION_CALL(
+ [&test, &bar]() {
+ return rtl::OUString("footest").replaceAll(test, bar); }));
+ CPPUNIT_ASSERT(
+ !VALID_CONVERSION_CALL(
+ [&consttest, &bar]() {
+ return rtl::OUString("footest").replaceAll(consttest, bar); }));
+ CPPUNIT_ASSERT(
+ !VALID_CONVERSION(
+ [&test, &constbar]() {
+ return rtl::OUString("footest").replaceAll(test, constbar); }));
CPPUNIT_ASSERT( rtl::OUString( "foobar" ) == rtl::OUString( "footest" ).replaceAll( consttest, constbar ));
}

b5ad72b Replace VALID_CONVERSION macro with function
.../rtl/strings/test_oustring_stringliterals.cxx | 42 +++++++++++++++-----
1 file changed, 32 insertions(+), 10 deletions(-)

Upstream: cgit.freedesktop.org

  • Share