Changeset 21699 in vbox

Timestamp:

Jul 17, 2009 2:26:51 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50250

Message:

iprt/log.h: Fixed the LogRel*Func macros.

File:

• trunk/include/iprt/log.h (modified) (2 diffs)

trunk/include/iprt/log.h

@@ -923 +923 @@
 #define LogRelFlow(a)      LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_FLOW,     LOG_GROUP, a)
 
-/** @def LogRelFlowFunc
- * Release logging.  Macro to log the execution flow inside C/C++ functions.
- *
- * Prepends the given log message with the function name followed by
- * a semicolon and space.
- *
- * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
- */
-# define LogRelFlowFunc(a) \
-    do { LogRelFlow((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); LogRelFlow(a); } while (0)
-
 /** @def LogRelFunc
  * Release logging.  Prepends the given log message with the function name
  * followed by a semicolon and space.
  */
-#define LogRelFunc(a) \
+#ifdef LOG_USE_C99
+# define LogRelFunc(a) \
+    _LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+#else
+# define LogRelFunc(a) \
     do { LogRel((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); LogRel(a); } while (0)
+#endif
 
 /** @def LogRelThisFunc
@@ -945 +939 @@
  * line is additionally prepended with a hex value of |this| pointer.
  */
-#define LogRelThisFunc(a) \
+#ifdef LOG_USE_C99
+# define LogRelThisFunc(a) \
+    _LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, "{%p} " LOG_FN_FMT ": %M", this, __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+#else
+# define LogRelThisFunc(a) \
     do { LogRel(("{%p} " LOG_FN_FMT ": ", this, __PRETTY_FUNCTION__)); LogRel(a); } while (0)
+#endif
+
+/** @def LogRelFlowFunc
+ * Release logging.  Macro to log the execution flow inside C/C++ functions.
+ *
+ * Prepends the given log message with the function name followed by
+ * a semicolon and space.
+ *
+ * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
+ */
+#ifdef LOG_USE_C99
+# define LogRelFlowFunc(a) \
+    _LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_FLOW, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+#else
+# define LogRelFlowFunc(a) \
+    do { LogRelFlow((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); LogRelFlow(a); } while (0)
+#endif
 
 /** @def LogRelLelik