[Libreoffice-commits] .: sal/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 9 12:55:33 PST 2013
sal/qa/rtl/strings/test_ostring_concat.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6880e2d31a38d5f4b44ba4f5b4a2b3e361a66312
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Wed Jan 9 21:40:40 2013 +0100
hack for apple's gcc-4.0.1 bug
My self-built 4.0.1 on Linux handles this fine, but 4.0.1 is not used
for LO building except for MacOSX. This specific operand combination
is rather unlikely, so this shouldn't actually cause any problem
in practice, hopefully, but I'd still like to check this where possible.
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index 6708960..b734cac 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -83,8 +83,10 @@ void test::ostring::StringConcat::checkConcat()
TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char* > )), typeid( OString( "foo" ) + d3 ));
CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d4 ));
TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( OString( "foo" ) + d4 ));
+#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ > 1 )
CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringBuffer( "foo" ) + OString( "bar" )));
TYPES_ASSERT_EQUAL(( typeid( OStringConcat< OStringBuffer, OString > )), typeid( OStringBuffer( "foo" ) + OString( "bar" )));
+#endif
}
#undef typeid
More information about the Libreoffice-commits
mailing list