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

diff --git a/Utils/Logger/Target.cti b/Utils/Logger/Target.cti
index 30a4523..bad63ab 100644
--- a/Utils/Logger/Target.cti
+++ b/Utils/Logger/Target.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer NETwork research (NET)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 /** \file
     \brief Target inline template implementation */
 
-//#include "Target.ih"
+#include "Target.ih"
 
 // Custom includes
 #include "Levels.hh"
@@ -34,78 +34,61 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::Target
 
-template <class Stream>
+// senf::log::Target::route
+
+#ifndef DOXYGEN
+
+template <class A1>
 prefix_ void senf::log::Target::route(action_t action, int index)
 {
-    route(&Stream::instance(), 0, NONE::value, action, index);
+    route<A1,mpl::nil,mpl::nil>(action, index);
 }
 
-template <class Stream, class Arg>
+template <class A1, class A2>
 prefix_ void senf::log::Target::route(action_t action, int index)
 {
-    route<Arg>(&Stream::instance(), static_cast<Arg*>(0), action, index);
+    route<A1,A2,mpl::nil>(action, index);
 }
 
-template <class Stream, class Area, class Level>
+template <class A1, class A2, class A3>
 prefix_ void senf::log::Target::route(action_t action, int index)
 {
-    route(&Stream::instance(), &Area::instance(), Level::value, action, index);
+    typedef detail::RouteParameters<A1,A2,A3> Params;
+    route( detail::InstanceP<typename Params::Stream, detail::StreamBase>::value(), 
+           detail::InstanceP<typename Params::Area, detail::AreaBase>::value(), 
+           Params::Level::value, 
+           action, index);
 }
 
-template <class Stream>
+template <class A1>
 prefix_ void senf::log::Target::unroute(action_t action)
 {
-    unroute(&Stream::instance(), 0, NONE::value, action);
+    unroute<A1,mpl::nil,mpl::nil>(action);
 }
 
-template <class Stream, class Arg>
+template <class A1, class A2>
 prefix_ void senf::log::Target::unroute(action_t action)
 {
-    unroute<Arg>(&Stream::instance(), static_cast<Arg*>(0), action);
+    unroute<A1,A2,mpl::nil>(action);
 }
 
-template <class Stream, class Area, class Level>
+template <class A1, class A2, class A3>
 prefix_ void senf::log::Target::unroute(action_t action)
 {
-    unroute(&Stream::instance(), &Area::instance(), 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)
-{
-    route(stream, &Area::instance(), NONE::value, action, index);
+    typedef detail::RouteParameters<A1,A2,A3> Params;
+    unroute( detail::InstanceP<typename Params::Stream, detail::StreamBase>::value(), 
+             detail::InstanceP<typename Params::Area, detail::AreaBase>::value(), 
+             Params::Level::value, 
+             action);
 }
 
-template <class Level>
-prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
-                                      detail::LevelBase const *, action_t action, int index)
-{
-    route(stream, 0, Level::value, action, index);
-}
-
-template <class Area>
-prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
-                                        detail::AreaBase const *, action_t action)
-{
-    unroute(stream, &Area::instance(), NONE::value, action);
-}
-
-template <class Level>
-prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
-                                        detail::LevelBase const *, action_t action)
-{
-    unroute(stream, 0, 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);
 }