From 6880e2d31a38d5f4b44ba4f5b4a2b3e361a66312 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Wed, 9 Jan 2013 21:40:40 +0100 Subject: 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. --- sal/qa/rtl/strings/test_ostring_concat.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sal') diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx index 67089601d76d..b734cac01467 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 -- cgit