From f958657cc5a179a2bccff06f88cd36f80b779184 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 15 Dec 2011 14:03:01 +0100 Subject: gcc-trunk: fix error: unable to find string literal operator 'operator"" FOO' --- tools/inc/tools/diagnose_ex.h | 8 ++++---- tools/source/stream/stream.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h index ce1b5a3d8db2..21463a66b427 100644 --- a/tools/inc/tools/diagnose_ex.h +++ b/tools/inc/tools/diagnose_ex.h @@ -102,14 +102,14 @@ OSL_ENSURE(c, m); \ throw ::com::sun::star::lang::IllegalArgumentException( \ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \ - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \ 0 ); } #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw ::com::sun::star::lang::IllegalArgumentException( \ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \ - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \ ifc, \ arg ); } @@ -121,7 +121,7 @@ OSL_ENSURE(c, m); \ throw ::com::sun::star::uno::RuntimeException( \ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \ - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } #define ENSURE_OR_THROW2(c, m, ifc) \ @@ -129,7 +129,7 @@ OSL_ENSURE(c, m); \ throw ::com::sun::star::uno::RuntimeException( \ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \ - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \ + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \ ifc ); } /** This macro asserts the given condition (in debug mode), and diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 19009f9ec07a..5fa5b0e43380 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1873,7 +1873,7 @@ void SvStream::RefreshBuffer() SvStream& SvStream::WriteNumber(sal_Int32 nInt32) { char buffer[12]; - sal_Size nLen = sprintf(buffer, "%"SAL_PRIdINT32, nInt32); + sal_Size nLen = sprintf(buffer, "%" SAL_PRIdINT32, nInt32); Write(buffer, nLen); return *this; } @@ -1881,7 +1881,7 @@ SvStream& SvStream::WriteNumber(sal_Int32 nInt32) SvStream& SvStream::WriteNumber(sal_uInt32 nUInt32) { char buffer[11]; - sal_Size nLen = sprintf(buffer, "%"SAL_PRIuUINT32, nUInt32); + sal_Size nLen = sprintf(buffer, "%" SAL_PRIuUINT32, nUInt32); Write(buffer, nLen); return *this; } -- cgit