X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketPolicy.ih;h=413635ba22d3fd045c72c50d8f631c283a7aee2c;hb=ae06fe86f16fdabb7ffb219d255444d2eb4f4f79;hp=0f70243acf0ab0055610c42d47ae53bc52397a74;hpb=21bad90912447cd2d390112cf2d2a7d383ad8058;p=senf.git

diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih
index 0f70243..413635b 100644
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -50,8 +50,8 @@
 #include <boost/mpl/and.hpp>
 #include <boost/utility.hpp> // for enable_if
 
-#include "Utils/mpl.hh"
-#include "Utils/pool_alloc_mixin.hh"
+#include "../Utils/mpl.hh"
+#include "../Utils/pool_alloc_mixin.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
@@ -111,8 +111,6 @@ namespace senf {
 
 namespace impl {
 
-    struct nil {};
-
     template <class Base, class Policy, int _>
     struct MakeSocketPolicy_merge
     {};
@@ -150,7 +148,7 @@ namespace impl {
         {};
 
         template <class Base>
-        struct apply<Base,nil>
+        struct apply<Base,mpl::nil>
         {
             typedef Base type;
         };
@@ -201,7 +199,7 @@ namespace impl {
 
     template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( SENF_SOCKET_POLICIES_N, 
                                                     class T, 
-                                                    senf::impl::nil ) >
+                                                    mpl::nil ) >
     class MakeSocketPolicy
         : public boost::mpl::if_< boost::is_convertible< T0*, SocketPolicyBase* >,
                                   impl::MakeSocketPolicy_impl<