X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cti;h=0f7e287ff931018c53e0a975ead3e4337104bdd7;hb=82ad2ed94c12c3e53097fef92978de8c28239fab;hp=30a45232ca6af8add3e6c07afc6a71bedd4cb442;hpb=56ec4faa5dcae61746a78375cb7de605d0b79738;p=senf.git

diff --git a/Utils/Logger/Target.cti b/Utils/Logger/Target.cti
index 30a4523..0f7e287 100644
--- a/Utils/Logger/Target.cti
+++ b/Utils/Logger/Target.cti
@@ -23,7 +23,7 @@
 /** \file
     \brief Target inline template implementation */
 
-//#include "Target.ih"
+#include "Target.ih"
 
 // Custom includes
 #include "Levels.hh"
@@ -34,82 +34,121 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::Target
 
+// senf::log::Target::route
+
+#ifndef DOXYGEN
+
 template <class Stream>
 prefix_ void senf::log::Target::route(action_t action, int index)
 {
     route(&Stream::instance(), 0, NONE::value, action, index);
 }
 
-template <class Stream, class Arg>
-prefix_ void senf::log::Target::route(action_t action, int index)
+template <class Stream, class Level>
+prefix_ void senf::log::Target::
+route(action_t action, int index,
+      typename boost::enable_if< boost::is_convertible<Level*, detail::LevelBase *> >::type *)
 {
-    route<Arg>(&Stream::instance(), static_cast<Arg*>(0), action, index);
+    route(&Stream::instance(), 0, Level::value, action, index);
+}
+
+template <class Stream, class Area>
+prefix_ void senf::log::Target::
+route(action_t action, int index,
+      typename boost::enable_if< boost::is_convertible<Area*, detail::AreaBase *> >::type *)
+{
+    route(&Stream::instance(), &Area::instance(), NONE::value, action, index);
+}
+
+template <class Stream, class AreaClass>
+prefix_ void senf::log::Target::
+route(action_t action, int index,
+      typename boost::enable_if< boost::is_convertible<typename AreaClass::SENFLogArea *, detail::AreaBase *> >::type *)
+{
+    route(&Stream::instance(), &AreaClass::SENFLogArea::instance(), NONE::value, action, index);
 }
 
 template <class Stream, class Area, class Level>
-prefix_ void senf::log::Target::route(action_t action, int index)
+prefix_ void senf::log::Target::
+route(action_t action, int index,
+      typename boost::enable_if< boost::is_convertible<Area *, detail::AreaBase *> >::type *)
 {
     route(&Stream::instance(), &Area::instance(), Level::value, action, index);
 }
 
-template <class Stream>
-prefix_ void senf::log::Target::unroute(action_t action)
+template <class Stream, class AreaClass, class Level>
+prefix_ void senf::log::Target::
+route(action_t action, int index,
+      typename boost::enable_if< boost::is_convertible<typename AreaClass::SENFLogArea *, detail::AreaBase *> >::type *)
 {
-    unroute(&Stream::instance(), 0, NONE::value, action);
+    route(&Stream::instance(), &AreaClass::SENFLogArea::instance(), Level::value, action, index);
 }
 
-template <class Stream, class Arg>
+// senf::log::target::ununroute
+
+template <class Stream>
 prefix_ void senf::log::Target::unroute(action_t action)
 {
-    unroute<Arg>(&Stream::instance(), static_cast<Arg*>(0), action);
+    unroute(&Stream::instance(), 0, NONE::value, action);
 }
 
-template <class Stream, class Area, class Level>
-prefix_ void senf::log::Target::unroute(action_t action)
+template <class Stream, class Level>
+prefix_ void senf::log::Target::
+unroute(action_t action,
+      typename boost::enable_if< boost::is_convertible<Level*, detail::LevelBase *> >::type *)
 {
-    unroute(&Stream::instance(), &Area::instance(), Level::value, action);
+    unroute(&Stream::instance(), 0, Level::value, action);
 }
 
-////////////////////////////////////////
-// private members
-
-template <class Area>
-prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
-                                      detail::AreaBase const *, action_t action, int index)
+template <class Stream, class Area>
+prefix_ void senf::log::Target::
+unroute(action_t action,
+      typename boost::enable_if< boost::is_convertible<Area*, detail::AreaBase *> >::type *)
 {
-    route(stream, &Area::instance(), NONE::value, action, index);
+    unroute(&Stream::instance(), &Area::instance(), NONE::value, action);
 }
 
-template <class Level>
-prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
-                                      detail::LevelBase const *, action_t action, int index)
+template <class Stream, class AreaClass>
+prefix_ void senf::log::Target::
+unroute(action_t action,
+      typename boost::enable_if< boost::is_convertible<typename AreaClass::SENFLogArea *, detail::AreaBase *> >::type *)
 {
-    route(stream, 0, Level::value, action, index);
+    unroute(&Stream::instance(), &AreaClass::SENFLogArea::instance(), NONE::value, action);
 }
 
-template <class Area>
-prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
-                                        detail::AreaBase const *, action_t action)
+template <class Stream, class Area, class Level>
+prefix_ void senf::log::Target::
+unroute(action_t action,
+      typename boost::enable_if< boost::is_convertible<Area *, detail::AreaBase *> >::type *)
 {
-    unroute(stream, &Area::instance(), NONE::value, action);
+    unroute(&Stream::instance(), &Area::instance(), Level::value, action);
 }
 
-template <class Level>
-prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
-                                        detail::LevelBase const *, action_t action)
+template <class Stream, class AreaClass, class Level>
+prefix_ void senf::log::Target::
+unroute(action_t action,
+      typename boost::enable_if< boost::is_convertible<typename AreaClass::SENFLogArea *, detail::AreaBase *> >::type *)
 {
-    unroute(stream, 0, Level::value, action);
+    unroute(&Stream::instance(), &AreaClass::SENFLogArea::instance(), Level::value, action);
 }
 
+#endif 
+
 ///////////////////////////////////////////////////////////////////////////
-// namespace senf::log members
+// namespace senf::log::detail members
 
 template <class Stream, class Area, class Level>
-prefix_ void senf::log::write(std::string msg)
+prefix_ void senf::log::detail::write(std::string msg)
 {
     TargetRegistry::instance().write(Stream::instance(), Area::instance(), Level::value, msg);
 }
 
+template <class Source>
+prefix_ void senf::log::timeSource()
+{
+    timeSource(std::auto_ptr<Source>(new Source()));
+}
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_