From 0c7bff02710f8ad7915e215f723b6abad0079221 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 23 Nov 2011 15:45:43 +0100 Subject: 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. --- jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jvmfwk') 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 -- cgit