Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / Logger / Log.ih

diff --git a/Utils/Logger/Log.ih b/Utils/Logger/Log.ih
index 95c6020..0d3f030 100644 (file)
--- 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
@@ -23,8 +23,8 @@
 /** \file
     \brief Log internal header */
 
-#ifndef IH_Log_
-#define IH_Log_ 1
+#ifndef IH_SENF_Utils_Logger_Log_
+#define IH_SENF_Utils_Logger_Log_ 1
 
 // Custom includes
 #include <sstream>
@@ -33,21 +33,25 @@
 
 #define SENF_LOG_BLOCK_(parameters, block)                                                        \
     do {                                                                                          \
-        if (parameters::compileEnabled && parameters::enabled()) {                                \
+        typedef parameters SENFLogParameters;                                                     \
+        if (SENFLogParameters::compileEnabled && SENFLogParameters::enabled()) {                  \
             std::stringstream log;                                                                \
             do block while(0);                                                                    \
-            senf::log::write<parameters::stream, parameters::area, parameters::level>(log.str()); \
+            senf::log::detail::write< SENFLogParameters::stream,                                  \
+                                      SENFLogParameters::area,                                    \
+                                      SENFLogParameters::level >(log.str());                      \
         }                                                                                         \
     } while(0) 
 
 #define SENF_LOG_BLOCK_TPL_(parameters, block)                                                    \
     do {                                                                                          \
-        if (parameters::compileEnabled && parameters::enabled()) {                                \
+        typedef parameters SENFLogParameters;                                                     \
+        if (SENFLogParameters::compileEnabled && SENFLogParameters::enabled()) {                  \
             std::stringstream log;                                                                \
             do block while(0);                                                                    \
-            senf::log::write<typename parameters::stream,                                         \
-                             typename parameters::area,                                           \
-                             typename parameters::level>(log.str());                              \
+            senf::log::detail::write<typename SENFLogParameters::stream,                          \
+                             typename SENFLogParameters::area,                                    \
+                             typename SENFLogParameters::level>(log.str());                       \
         }                                                                                         \
     } while(0)