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 /jvmfwk | |
| 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 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h index eb1cd03c8a8d..fd6b5f312b62 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h +++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h @@ -32,13 +32,13 @@ #include "sal/config.h" #include "rtl/oustringostreaminserter.hxx" -#include "sal/log.h" +#include "sal/log.hxx" -#define JFW_ENSURE(c, m) SAL_WARN_IF_S(!(c), "jfw", m) +#define JFW_ENSURE(c, m) SAL_WARN_IF(!(c), "jfw", m) -#define JFW_TRACE0(m) SAL_INFO_S("jfw.level1", m) +#define JFW_TRACE0(m) SAL_INFO("jfw.level1", m) -#define JFW_TRACE2(m) SAL_INFO_S("jfw.level2", m); +#define JFW_TRACE2(m) SAL_INFO("jfw.level2", m); #endif |