/** \file
\brief Config internal header */
-#ifndef IH_Config_
-#define IH_Config_ 1
+#ifndef IH_SENF_Utils_Logger_Config_
+#define IH_SENF_Utils_Logger_Config_ 1
// Custom includes
#include <boost/preprocessor/expand.hpp>
#include <boost/preprocessor/seq/fold_right.hpp>
#include <boost/preprocessor/seq/pop_back.hpp>
#include <boost/preprocessor/if.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
#include "../preprocessor.hh"
///////////////////////////////ih.p////////////////////////////////////////
struct na {};
/// Internal: Compile time configuration for given \a Stream and \a Area
- template <class Stream, class Area>
+ template <class Stream, class Area, class QueryStream=Stream, bool Query=true>
struct Config
{
- typedef typename Config<Stream,na>::compileLimit compileLimit;
+ typedef typename Config<na, Area, Stream, Query>::compileLimit compileLimit;
};
# ifndef DOXYGEN
- template <class Stream>
- struct Config<Stream, na>
+ template <class Area, class QueryStream, bool Query>
+ struct Config<na, Area, QueryStream, Query>
{
- typedef typename Stream::compileLimit compileLimit;
+ typedef typename Config<QueryStream, na, QueryStream, Query>::compileLimit compileLimit;
+ };
+
+ template <class Stream, class QueryStream, bool Query>
+ struct Config<Stream, na, QueryStream, Query>
+ {
+ typedef typename Config<na, na, QueryStream, Query>::compileLimit compileLimit;
+ };
+
+ template <class QueryStream, bool Query>
+ struct Config<na, na, QueryStream, Query>
+ {
+ typedef typename QueryStream::compileLimit compileLimit;
};
# endif
}}}
-#define SENF_LOG_SEQ_TO_NAME_(s,state,elem) state::elem
+#define SENF_LOG_CHECK_NA_
+
+#define SENF_LOG_CAT(a,b) SENF_LOG_CAT_I(a,b)
+#define SENF_LOG_CAT_I(a,b) a ## b
+
+#define SENF_LOG_IS_NA(elt) BOOST_PP_IS_EMPTY( SENF_LOG_CAT(SENF_LOG_CHECK_NA, elt) )
+
+#define SENF_LOG_SEQ_TO_NAME_(s,state,elem) \
+ BOOST_PP_IF( SENF_LOG_IS_NA(elem), senf::log::detail::na, state::elem )
#define SENF_LOG_SEQ_TO_NAME(seq) \
BOOST_PP_SEQ_FOLD_LEFT(SENF_LOG_SEQ_TO_NAME_, , seq)
BOOST_PP_SEQ_POP_BACK(seq) )
#define SENF_LOG_PREDECL_short(seq) \
- class SENF_PP_SEQ_BACK(seq);
+ BOOST_PP_IF( SENF_LOG_IS_NA( SENF_PP_SEQ_BACK(seq) ), ; , class SENF_PP_SEQ_BACK(seq); )
#define SENF_LOG_PREDECL(seq) \
BOOST_PP_CAT(SENF_LOG_PREDECL_, \
SENF_LOG_PREDECL(stream) \
SENF_LOG_PREDECL(area) \
namespace senf { namespace log { namespace detail { \
- template <> \
+ template <class QueryStream> \
struct Config< SENF_LOG_SEQ_TO_NAME(stream), \
- SENF_LOG_SEQ_TO_NAME(area) > \
+ SENF_LOG_SEQ_TO_NAME(area), \
+ QueryStream, \
+ true > \
{ typedef senf::log::level compileLimit; }; \
}}}
#ifdef SENF_LOG_CONF
-# define _ senf::log::detail::na
# 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
-# undef _
#endif