Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / Logger / Target.ih

diff --git a/Utils/Logger/Target.ih b/Utils/Logger/Target.ih
index d80902e..c96eb32 100644 (file)
--- a/Utils/Logger/Target.ih
+++ b/Utils/Logger/Target.ih
@@ -23,12 +23,11 @@
 /** \file
     \brief Target internal header */
 
-#ifndef IH_Target_
-#define IH_Target_ 1
+#ifndef IH_SENF_Utils_Logger_Target_
+#define IH_SENF_Utils_Logger_Target_ 1
 
 // Custom includes
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/static_assert.hpp>
 
@@ -48,8 +47,6 @@ namespace detail {
         void write(StreamBase const & stream, AreaBase const & area, unsigned level, 
                    std::string msg);
 
-        void timeSource(std::auto_ptr<TimeSource> source);
-
         void routed();
         bool fallbackRouting();
 
@@ -61,7 +58,6 @@ namespace detail {
 
         typedef std::set<Target *> Targets;
         Targets targets_;
-        boost::scoped_ptr<TimeSource> timeSource_;
 
         bool fallbackRouting_;
         
@@ -87,7 +83,7 @@ namespace detail {
     // For g++ 4.0 (at least) we need to provide the fully scoped name for this default value.
     // no idea why. It works without the scope in 4.1
     template < class T, class A2, class A1,
-               unsigned type = SENF_MPL_RV( senf::Log::detail::RouteParameterCheck_(static_cast<T*>(0)) ) >
+               unsigned type = SENF_MPL_RV( senf::log::detail::RouteParameterCheck_(static_cast<T*>(0)) ) >
     struct RouteParameters
     {};
 
@@ -113,7 +109,7 @@ namespace detail {
         : public RouteParameters<A2,A1,mpl::nil>
     {
         typedef RouteParameters<A2,A1,mpl::nil> base;
-        BOOST_STATIC_ASSERT( boost::is_same<typename base::Stream, mpl::nil>::value );
+        BOOST_STATIC_ASSERT(( boost::is_same<typename base::Stream, mpl::nil>::value ));
         typedef T Stream;
     };
 
@@ -122,7 +118,7 @@ namespace detail {
         : public RouteParameters<A2,A1,mpl::nil>
     {
         typedef RouteParameters<A2,A1,mpl::nil> base;
-        BOOST_STATIC_ASSERT( boost::is_same<typename base::Area, mpl::nil>::value );
+        BOOST_STATIC_ASSERT(( boost::is_same<typename base::Area, mpl::nil>::value ));
         typedef T Area;
     };
 
@@ -131,7 +127,7 @@ namespace detail {
         : public RouteParameters<A2,A1,mpl::nil>
     {
         typedef RouteParameters<A2,A1,mpl::nil> base;
-        BOOST_STATIC_ASSERT( boost::is_same<typename base::Area, mpl::nil>::value );
+        BOOST_STATIC_ASSERT(( boost::is_same<typename base::Area, mpl::nil>::value ));
         typedef typename T::SENFLogArea Area;
     };
 
@@ -140,7 +136,7 @@ namespace detail {
         : public RouteParameters<A2,A1,mpl::nil>
     {
         typedef RouteParameters<A2,A1,mpl::nil> base;
-        BOOST_STATIC_ASSERT( boost::is_same<typename base::Level, NilLevel>::value );
+        BOOST_STATIC_ASSERT(( boost::is_same<typename base::Level, NilLevel>::value ));
         typedef T Level;
     };