diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:45:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:50:58 +0100 |
| commit | 0c7bff02710f8ad7915e215f723b6abad0079221 (patch) | |
| tree | 30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /svl | |
| parent | f4573ceb2965ccc8abc1f5165b0fa63f5d63649f (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 'svl')
| -rw-r--r-- | svl/source/items/poolio.cxx | 6 | ||||
| -rw-r--r-- | svl/source/items/whassert.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index ce5bb32b7db4..b9dac71f139d 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -32,7 +32,7 @@ #include <string.h> #include <stdio.h> -#include <sal/log.h> +#include <sal/log.hxx> #include <tools/solar.h> #include <svl/itempool.hxx> #include "whassert.hxx" @@ -956,11 +956,11 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) delete rpNewItem; rpNewItem = pOldItem; bFound = true; - SAL_INFO_S("svl", "reusing item" << pOldItem); + SAL_INFO("svl", "reusing item" << pOldItem); break; } } - SAL_INFO_IF_S( + SAL_INFO_IF( !bFound, "svl", "item not found: " << pOldItem); } } diff --git a/svl/source/items/whassert.hxx b/svl/source/items/whassert.hxx index d994f0d33f66..290b2f06bca8 100644 --- a/svl/source/items/whassert.hxx +++ b/svl/source/items/whassert.hxx @@ -30,9 +30,9 @@ #include "sal/config.h" -#include "sal/log.h" +#include "sal/log.hxx" -#define SFX_ASSERT( bCondition, nId, sMessage ) SAL_WARN_IF_S( \ +#define SFX_ASSERT( bCondition, nId, sMessage ) SAL_WARN_IF( \ !(bCondition), "svl", (sMessage) << ", with ID/pos " << (nId)); #endif |