X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FParameters.ih;h=5370f9702dcfc80ca02cb20c08c21a8d7edd06ff;hb=ac86c2bb40746fbedf70a19af3307e5da642b04a;hp=9c6529c616eba09080e27812735a8d54afd8414f;hpb=ae06fe86f16fdabb7ffb219d255444d2eb4f4f79;p=senf.git

diff --git a/Utils/Logger/Parameters.ih b/Utils/Logger/Parameters.ih
index 9c6529c..5370f97 100644
--- a/Utils/Logger/Parameters.ih
+++ b/Utils/Logger/Parameters.ih
@@ -34,6 +34,8 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/fold.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/utility.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include "../mpl.hh"
 #include "Config.hh"
 
@@ -67,7 +69,7 @@ namespace detail {
     senf::mpl::rv<2> Parameters_select_(AreaBase *);
     template <class Base, class Param>
     struct Parameters_<Base,Param,2> : public Base
-    { typedef Param area; };
+    { typedef Param area; typedef Param area_base; };
 
     senf::mpl::rv<3> Parameters_select_(LevelBase *);
     template <class Base, class Param>
@@ -96,7 +98,7 @@ namespace detail {
         typename boost::disable_if< boost::is_convertible<T*,AliasBase*> >::type * = 0);
     template <class Base, class Param>
     struct Parameters_<Base,Param,6> : public Base
-    { typedef typename Param::SENFLogArea area; };
+    { typedef typename Param::SENFLogArea area; typedef Param area_base; };
 
 #endif
 
@@ -110,13 +112,12 @@ namespace detail {
 
         static bool const compileEnabled = senf::log::Enabled<
             typename Base::stream, 
-            typename Base::area, 
+            typename Base::area_base, 
             level>::value;
 
         static bool enabled() { 
             return compileEnabled
-                && Base::area::instance().streamLimit(Base::stream::instance()) 
-                <= Base::level::value;
+                && Base::area::instance().limit(Base::stream::instance()) <= level::value;
         }
     };