X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FConfig.ih;h=1ead3fcb3153940283fce44e30bad28bd5c25e27;hb=e879290346fe5242d7df2d70ee552d264081492f;hp=10b9e4a349677b0a656d7daae872b158b00c4b0a;hpb=9ff976ea47b175355a1f7ef4d05f14edb98a82e4;p=senf.git

diff --git a/Utils/Logger/Config.ih b/Utils/Logger/Config.ih
index 10b9e4a..1ead3fc 100644
--- a/Utils/Logger/Config.ih
+++ b/Utils/Logger/Config.ih
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -41,58 +41,69 @@ namespace senf {
 namespace log {
 namespace detail {
 
+    struct na {};
+
+    /// Internal: Compile time configuration for given \a Stream and \a Area
     template <class Stream, class Area>
     struct Config
     {
-        typedef typename Config<Stream,void>::compileLimit compileLimit;
+        typedef typename Config<Stream,na>::compileLimit compileLimit;
     };
 
+#   ifndef DOXYGEN
+
     template <class Stream>
-    struct Config<Stream, void>
+    struct Config<Stream, na>
     {
         typedef typename Stream::compileLimit compileLimit;
     };
 
+#   endif
+
 }}}
 
-#define SENF_LOG_SEQ_TO_NAME_(s,data,elem) ::elem
+#define SENF_LOG_SEQ_TO_NAME_(s,state,elem) state::elem
 
 #define SENF_LOG_SEQ_TO_NAME(seq)                                                                 \
-    BOOST_PP_SEQ_FOR_EACH(SENF_LOG_SEQ_TO_NAME_, none, seq)
+    BOOST_PP_SEQ_FOLD_LEFT(SENF_LOG_SEQ_TO_NAME_, , seq)
 
 #define SENF_LOG_PREDECL_(s, state, elem)                                                         \
     namespace elem { state }
 
-#define SENF_LOG_PREDECL(seq)                                                                     \
+#define SENF_LOG_PREDECL_long(seq)                                                                \
     BOOST_PP_SEQ_FOLD_RIGHT( SENF_LOG_PREDECL_,                                                   \
                              class SENF_PP_SEQ_BACK(seq);,                                        \
                              BOOST_PP_SEQ_POP_BACK(seq) )
 
+#define SENF_LOG_PREDECL_short(seq)                                                               \
+        class SENF_PP_SEQ_BACK(seq);
+
+#define SENF_LOG_PREDECL(seq)                                                                     \
+    BOOST_PP_CAT(SENF_LOG_PREDECL_,                                                               \
+                 BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(seq)),long,short))(seq)
+
 #define SENF_LOG_NIL(x)
 
 #define SENF_LOG_CONF_DEFINE(stream, area, level)                                                 \
     SENF_LOG_PREDECL(stream)                                                                      \
-    BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(area)),                                            \
-                SENF_LOG_PREDECL,                                                                 \
-                SENF_LOG_NIL)(area)                                                               \
+    SENF_LOG_PREDECL(area)                                                                        \
     namespace senf { namespace log { namespace detail {                                           \
         template <>                                                                               \
         struct Config< SENF_LOG_SEQ_TO_NAME(stream),                                              \
-                       BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(area)),                         \
-                                   SENF_LOG_SEQ_TO_NAME(area),                                    \
-                                   void) >                                                        \
+                       SENF_LOG_SEQ_TO_NAME(area) >                                               \
         { typedef senf::log::level compileLimit; };                                               \
     }}}
 
 #ifdef SENF_LOG_CONF
 
-#   define SLC_elt(s, state, elt)                                                                  \
+#   define _ senf::log::detail::na
+#   define SLC_elt(r, data, elt) \
         SENF_LOG_CONF_DEFINE elt
 
-    // Need to use fold here to not exhaust the maximum FOR nesting depth ...
-    BOOST_PP_SEQ_FOLD_LEFT(SLC_elt, none, SENF_LOG_CONF)
+    BOOST_PP_SEQ_FOR_EACH(SLC_elt, none, SENF_LOG_CONF)
 
 #   undef SLC_elt
+#   undef _
 
 #endif