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

diff --git a/Utils/Logger/Config.ih b/Utils/Logger/Config.ih
index dae740d..f8ed4f7 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////////////////////////////////////////
 
@@ -38,37 +41,65 @@ namespace senf {
 namespace log {
 namespace detail {
 
+    /// 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;
     };
 
+#   ifndef DOXYGEN
+
     template <class Stream>
     struct Config<Stream, void>
     {
         typedef typename Stream::compileLimit compileLimit;
     };
 
-#   define SENF_LOG_CONF_DEFINE(stream, area, level)                                              \
-           template <>                                                                            \
-           struct Config<stream, area>                                                            \
-           { typedef senf::log::level compileLimit; };
+#   endif
 
-#   ifdef SENF_LOG_CONF
+}}}
 
-#       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_(s,state,elem) state::elem
 
-        BOOST_PP_SEQ_FOR_EACH(SLC_elt, x, SENF_LOG_CONF)
+#define SENF_LOG_SEQ_TO_NAME(seq)                                                                 \
+    BOOST_PP_SEQ_FOLD_LEFT(SENF_LOG_SEQ_TO_NAME_, , seq)
 
-#       undef SLC_elt
-#       undef _
+#define SENF_LOG_PREDECL_(s, state, elem)                                                         \
+    namespace elem { state }
 
-#   endif
+#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) )
+
+#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(r, data, elt) \
+        SENF_LOG_CONF_DEFINE elt
+
+    BOOST_PP_SEQ_FOR_EACH(SLC_elt, none, SENF_LOG_CONF)
+
+#   undef SLC_elt
+
+#endif
 
-}}}