X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FLog.ih;h=4abdad951997a9ae66a73bc20e4f8a3df85dfb76;hb=2400f5c9d91e715773ed965fb92da1b6a54903e5;hp=d669ff5a96b664a0b37211b8279c960068d79752;hpb=61419d9a2e1060f7ede22fa19fd9d0b401bbc87a;p=senf.git

diff --git a/Utils/Logger/Log.ih b/Utils/Logger/Log.ih
index d669ff5..4abdad9 100644
--- a/Utils/Logger/Log.ih
+++ b/Utils/Logger/Log.ih
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer NETwork research (NET)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -27,15 +27,31 @@
 #define IH_Log_ 1
 
 // Custom includes
+#include <sstream>
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
 #define SENF_LOG_BLOCK_(parameters, block)                                                        \
     do {                                                                                          \
-        if (parameters::compile_enabled && parameters::enabled()) {                               \
-            std::ostream & log (parameters::log_stream());                                        \
+        typedef parameters SENFLogParameters;                                                     \
+        if (SENFLogParameters::compileEnabled && SENFLogParameters::enabled()) {                  \
+            std::stringstream log;                                                                \
             do block while(0);                                                                    \
-            log << std::endl;                                                                     \
+            senf::log::detail::write< SENFLogParameters::stream,                                  \
+                                      SENFLogParameters::area,                                    \
+                                      SENFLogParameters::level >(log.str());                      \
+        }                                                                                         \
+    } while(0) 
+
+#define SENF_LOG_BLOCK_TPL_(parameters, block)                                                    \
+    do {                                                                                          \
+        typedef parameters SENFLogParameters;                                                     \
+        if (SENFLogParameters::compileEnabled && SENFLogParameters::enabled()) {                  \
+            std::stringstream log;                                                                \
+            do block while(0);                                                                    \
+            senf::log::detail::write<typename SENFLogParameters::stream,                          \
+                             typename SENFLogParameters::area,                                    \
+                             typename SENFLogParameters::level>(log.str());                       \
         }                                                                                         \
     } while(0)