X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2Fmpl.hh;h=fb1b5664c36e900b4e817f626cd5dfec857e5b1f;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=5428e1dff73f037613d33c1ed5534c09e1914d8c;hpb=85dd621b12b8c974b132e6af0818f64a029b081d;p=senf.git

diff --git a/Utils/mpl.hh b/Utils/mpl.hh
index 5428e1d..fb1b566 100644
--- a/Utils/mpl.hh
+++ b/Utils/mpl.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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,8 +23,8 @@
 /** \file
     \brief mpl public header */
 
-#ifndef HH_mpl_
-#define HH_mpl_ 1
+#ifndef HH_SENF_Utils_mpl_
+#define HH_SENF_Utils_mpl_ 1
 
 // Custom includes
 #include "../config.hh"
@@ -45,6 +45,7 @@ namespace mpl {
         to mark missing arguments 
         
         \note Don't use this as an empty base class. We may add some informative members to this.
+        \ingroup senfmpl
      */
     struct nil {};
 
@@ -155,6 +156,8 @@ namespace mpl {
      */
     template <class _> struct take_class {};
 
+#ifndef SENF_MPL_SLOT_NOEXPAND
+
     /** \brief Define MPL slot
 
         The slot macros \ref SENF_MPL_SLOT_DEF(), \ref SENF_MPL_SLOT_SET() and \ref
@@ -219,6 +222,8 @@ namespace mpl {
 #   define SENF_MPL_SLOT_GET(name)                                                                \
         SENF_MPL_SLOT_I_GET(name)
 
+#endif
+
 }}
 
 ///////////////////////////////hh.e////////////////////////////////////////