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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 13f3a2abcd79..a4c8bc925bcb 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -34,7 +34,7 @@ #include "rtl/oustringostreaminserter.hxx" #include "rtl/uri.hxx" #include "rtl/bootstrap.hxx" -#include "sal/log.h" +#include "sal/log.hxx" #include "osl/file.hxx" #include "cppuhelper/exc_hlp.hxx" #include "comphelper/servicedecl.hxx" @@ -75,7 +75,7 @@ void PackageRegistryBackend::disposing( lang::EventObject const & event ) ::osl::MutexGuard guard( getMutex() ); if ( m_bound.erase( url ) != 1 ) { - SAL_WARN_S("basic", "erase(" << url << ") != 1"); + SAL_WARN("basic", "erase(" << url << ") != 1"); } } @@ -681,7 +681,7 @@ void Package::processPackage_impl( } } catch (RuntimeException &e) { - SAL_WARN_S( + SAL_WARN( "basic", "unexpected RuntimeException \"" << e.Message << '"'); throw; } |