minor fixes for clang++

[senf.git] / senf / Socket / SocketPolicy.ih

diff --git a/senf/Socket/SocketPolicy.ih b/senf/Socket/SocketPolicy.ih
index b335280..c9c57eb 100644 (file)
--- a/senf/Socket/SocketPolicy.ih
+++ b/senf/Socket/SocketPolicy.ih
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Policy Framework internal header
@@ -50,10 +55,10 @@
 #include <boost/mpl/and.hpp>
 #include <boost/utility.hpp> // for enable_if
 
-#include "../Utils/mpl.hh"
-#include "../Utils/pool_alloc_mixin.hh"
+#include <senf/Utils/mpl.hh>
+#include <senf/Utils/pool_alloc_mixin.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// \cond disabled
 // Hide this code from doxygen
@@ -91,7 +96,7 @@ namespace senf {
     template < BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateArgs, , SENF_SOCKET_POLICIES ) >
     struct SocketPolicy
         : public SocketPolicyBase,
-          public senf::pool_alloc_mixin< 
+          public senf::pool_alloc_mixin<
               SocketPolicy< BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateParms, , SENF_SOCKET_POLICIES ) > >
     {
 #   define SP_DeclarePolicyMember(x1,x2,SomePolicy)                                               \
@@ -197,30 +202,30 @@ namespace impl {
 
 } // namespace impl
 
-    template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( SENF_SOCKET_POLICIES_N, 
-                                                    class T, 
+    template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( SENF_SOCKET_POLICIES_N,
+                                                    class T,
                                                     mpl::nil ) >
     class MakeSocketPolicy
         : public boost::mpl::if_< boost::is_convertible< T0*, SocketPolicyBase* >,
-                                  impl::MakeSocketPolicy_impl< 
-                                      T0, 
-                                      boost::mpl::vector< 
-                                          BOOST_PP_ENUM_SHIFTED_PARAMS( 
+                                  impl::MakeSocketPolicy_impl<
+                                      T0,
+                                      boost::mpl::vector<
+                                          BOOST_PP_ENUM_SHIFTED_PARAMS(
                                               SENF_SOCKET_POLICIES_N, T ) > >,
-                                  impl::MakeSocketPolicy_impl< 
+                                  impl::MakeSocketPolicy_impl<
                                       SocketPolicy<>,
-                                      boost::mpl::vector< 
-                                          BOOST_PP_ENUM_PARAMS( 
+                                      boost::mpl::vector<
+                                          BOOST_PP_ENUM_PARAMS(
                                               SENF_SOCKET_POLICIES_N, T ) > > >::type
     {};
 
     template <class BasePolicy, class DerivedPolicy>
     struct SocketPolicyIsBaseOf
-        : public boost::mpl::if_< 
+        : public boost::mpl::if_<
               boost::mpl::and_< boost::is_convertible< BasePolicy*, SocketPolicyBase* >,
                                 boost::is_convertible< DerivedPolicy*, SocketPolicyBase* > >,
               impl::SocketPolicy_compatibility<BasePolicy,DerivedPolicy>,
-              boost::false_type 
+              boost::false_type
           >::type
     {};
 
@@ -248,7 +253,7 @@ namespace impl {
 
 /// \endcond
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f