X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FParameters.ih;h=1dcec4150b073570b812769da9d8c83b77916436;hb=7661548b20e6c7627f54bff87e0758396fd523ef;hp=4941b79191b0975546570f9a73beb989dfa8de3b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Logger/Parameters.ih b/senf/Utils/Logger/Parameters.ih index 4941b79..1dcec41 100644 --- a/senf/Utils/Logger/Parameters.ih +++ b/senf/Utils/Logger/Parameters.ih @@ -36,15 +36,15 @@ #include #include #include -#include "../mpl.hh" +#include #include "Config.hh" #include "Target.hh" -///////////////////////////////ih.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace log { - + class DefaultArea; class Debug; class NONE; @@ -84,7 +84,7 @@ namespace detail { senf::mpl::rv<5> Parameters_select_(AliasBase *); template - struct Parameters_ + struct Parameters_ : public Param::template apply::type {}; @@ -92,7 +92,7 @@ namespace detail { // this name is created by SENF_LOG_CLASS_AREA() template senf::mpl::rv<6> Parameters_select_( - T *, + T *, typename boost::disable_if< boost::is_convertible >::type * = 0, typename boost::disable_if< boost::is_convertible >::type * = 0, typename boost::disable_if< boost::is_convertible >::type * = 0, @@ -107,16 +107,16 @@ namespace detail { template struct Parameters : public Base { - typedef typename boost::mpl::if_c< Base::level::value == NONE::value, - typename Base::stream::defaultLevel, + typedef typename boost::mpl::if_c< Base::level::value == NONE::value, + typename Base::stream::defaultLevel, typename Base::level >::type level; static bool const compileEnabled = senf::log::Enabled< - typename Base::stream, - typename Base::area_base, + typename Base::stream, + typename Base::area_base, level>::value; - static bool enabled() { + static bool enabled() { return compileEnabled && ( senf::log::detail::TargetRegistry::instance().fallbackRouting() || Base::area::instance().limit(Base::stream::instance()) <= level::value ); @@ -133,8 +133,8 @@ namespace detail { template struct apply { typedef Parameters_< - Base, - Param, + Base, + Param, SENF_MPL_RV(Parameters_select_(static_cast(0)))> type; }; }; @@ -163,7 +163,7 @@ typedef senf::log::NONE SENFLogDefaultLevel; senf::log::detail::empty, \ (SENFLogDefaultStream)(SENFLogDefaultArea)(SENFLogDefaultLevel)args) > -///////////////////////////////ih.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif