summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-23 15:45:43 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-23 15:50:58 +0100
commit0c7bff02710f8ad7915e215f723b6abad0079221 (patch)
tree30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /sal/rtl
parentf4573ceb2965ccc8abc1f5165b0fa63f5d63649f (diff)
Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.
A compile time check ensures the common case of streaming just a plain C-style string literal still produces reasonably compact call-site code. The format-string variants are still available in sal/detail/log.h, but only to be used in obsolete osl/diagnose.h etc., and going to be removed again eventually.
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/source/logfile.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index c5858c1747b8..a9bf40b5a0ee 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -44,7 +44,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/alloc.h>
#include <rtl/instance.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
#include "osl/thread.h"
#include <algorithm>
@@ -109,7 +109,7 @@ OUString getFileUrl( const OUString &name )
if ( osl_getFileURLFromSystemPath( name.pData, &aRet.pData )
!= osl_File_E_None )
{
- SAL_WARN_S(
+ SAL_WARN(
"sal", "osl_getFileURLFromSystemPath failed for \"" << name << '"');
}
@@ -185,7 +185,7 @@ void init() {
}
else
{
- SAL_WARN_S(
+ SAL_WARN(
"sal",
"Couldn't open logfile " << o << '(' << e << ')');
}