X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FStreamRegistry.hh;h=48e5c59a1816bfc1351132d8bb73ab37cf7395c5;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=63ba124dbc768adfec7098648719991a027e085e;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Utils/Logger/StreamRegistry.hh b/Utils/Logger/StreamRegistry.hh
index 63ba124..48e5c59 100644
--- a/Utils/Logger/StreamRegistry.hh
+++ b/Utils/Logger/StreamRegistry.hh
@@ -23,12 +23,13 @@
 /** \file
     \brief StreamRegistry public header */
 
-#ifndef HH_StreamRegistry_
-#define HH_StreamRegistry_ 1
+#ifndef HH_SENF_Utils_Logger_StreamRegistry_
+#define HH_SENF_Utils_Logger_StreamRegistry_ 1
 
 // Custom includes
 #include <map>
 #include <functional>
+#include <ext/functional>
 #include <boost/iterator/transform_iterator.hpp>
 #include "Levels.hh"
 #include "../singleton.hh"
@@ -55,14 +56,9 @@ namespace log {
     {
         typedef std::map<std::string, detail::StreamBase const *> Registry;
 
-        struct SelectName 
-        {
-            typedef std::string result_type;
-            std::string const & operator()(Registry::value_type const & v) const;
-        };
-
     public:
-        typedef boost::transform_iterator<SelectName, Registry::const_iterator> iterator;
+        typedef boost::transform_iterator< ::__gnu_cxx::select1st<Registry::value_type>, 
+                                           Registry::const_iterator > iterator;
 
 #       ifdef DOXYGEN
         // Hmm ... doxygen does not understand 'using declarations' ...
@@ -75,11 +71,12 @@ namespace log {
         iterator begin();
         iterator end();
 
+        detail::StreamBase const * lookup(std::string const & name);
+
     private:
         StreamRegistry();
 
         void registerStream(detail::StreamBase const & stream);
-        detail::StreamBase const * lookup(std::string const & name);
 
         Registry registry_;