From 2ac5b08361bf0c7c98ff9bc10869e2b41c9d85fd Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 3 Apr 2012 17:29:08 +0200 Subject: try including the ostream< std::basic_ostream & operator <<( std::basic_ostream & stream, rtl::OUString const & string) diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index ee1ba7f7eed5..093b6c953fa4 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -2085,4 +2085,9 @@ inline OString OUStringToOString( const OUString & rUnicode, #endif /* _RTL_USTRING_HXX */ +// Include the ostream << operator directly here, so that it's always available +// for SAL_INFO etc. Make sure it's outside of #ifdef _RTL_USTRING_HXX, because +// includes ustring.hxx back. +#include + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index 59c11cd02713..bb41a6f58e03 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -197,13 +197,9 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { SAL_INFO("foo", "string " << s << " of length " << n) - would be an example of such a call; if the given s is of type rtl::OUString, + would be an example of such a call. - \#include "rtl/oustringostreaminserter.hxx" - - would make sure that an appropriate operator << is available. - - In either case, the composed message should be in UTF-8 and it should + In the composed message should be in UTF-8 and it should contain no vertical formatting characters and no null characters For the _IF variants, log output is only generated if the given condition is -- cgit v1.2.3