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

diff --git a/Utils/Logger/Config.ih b/Utils/Logger/Config.ih
index dae740d..10b9e4a 100644
--- a/Utils/Logger/Config.ih
+++ b/Utils/Logger/Config.ih
@@ -30,7 +30,10 @@
 #include <boost/preprocessor/expand.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/to_tuple.hpp>
-#include "Defaults.hh"
+#include <boost/preprocessor/seq/fold_right.hpp>
+#include <boost/preprocessor/seq/pop_back.hpp>
+#include <boost/preprocessor/if.hpp>
+#include "../preprocessor.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
@@ -50,25 +53,49 @@ namespace detail {
         typedef typename Stream::compileLimit compileLimit;
     };
 
-#   define SENF_LOG_CONF_DEFINE(stream, area, level)                                              \
-           template <>                                                                            \
-           struct Config<stream, area>                                                            \
-           { typedef senf::log::level compileLimit; };
+}}}
 
-#   ifdef SENF_LOG_CONF
+#define SENF_LOG_SEQ_TO_NAME_(s,data,elem) ::elem
 
-#       define _ void
-#       define SLC_elt(r, data, elt) \
-            BOOST_PP_EXPAND(SENF_LOG_CONF_DEFINE BOOST_PP_SEQ_TO_TUPLE(elt))
+#define SENF_LOG_SEQ_TO_NAME(seq)                                                                 \
+    BOOST_PP_SEQ_FOR_EACH(SENF_LOG_SEQ_TO_NAME_, none, seq)
 
-        BOOST_PP_SEQ_FOR_EACH(SLC_elt, x, SENF_LOG_CONF)
+#define SENF_LOG_PREDECL_(s, state, elem)                                                         \
+    namespace elem { state }
 
-#       undef SLC_elt
-#       undef _
+#define SENF_LOG_PREDECL(seq)                                                                     \
+    BOOST_PP_SEQ_FOLD_RIGHT( SENF_LOG_PREDECL_,                                                   \
+                             class SENF_PP_SEQ_BACK(seq);,                                        \
+                             BOOST_PP_SEQ_POP_BACK(seq) )
 
-#   endif
+#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)                                                               \
+    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) >                                                        \
+        { typedef senf::log::level compileLimit; };                                               \
+    }}}
+
+#ifdef SENF_LOG_CONF
+
+#   define SLC_elt(s, state, 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)
+
+#   undef SLC_elt
+
+#endif
 
-}}}