X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FConfig.cci;h=0194814569eface4b0803ca9e50fa100b5aaa848;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=9988f033375c5579e31ac43a7d81ff8f8bc95c62;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Config.cci b/senf/Utils/Console/Config.cci
index 9988f03..0194814 100644
--- a/senf/Utils/Console/Config.cci
+++ b/senf/Utils/Console/Config.cci
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 Config inline non-template implementation */
@@ -26,19 +31,18 @@
 #include "Config.ih"
 
 // Custom includes
-#include "../../Utils/membind.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::RestrictedExecutor
 
 prefix_ bool senf::console::detail::RestrictedExecutor::complete()
     const
 {
-    return parsedNodes_.size() == 1 
-        && ! parsedNodes_[0].expired() 
+    return parsedNodes_.size() == 1
+        && ! parsedNodes_[0].expired()
         && *parsedNodes_[0].lock() == executor_.chroot();
 }
 
@@ -63,7 +67,7 @@ prefix_ std::ostream & senf::console::detail::RestrictedExecutor::stream()
     return stream_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ConfigBundle
 
 prefix_ senf::console::ConfigBundle::ConfigBundle()
@@ -101,7 +105,7 @@ prefix_ void senf::console::ConfigBundle::chroot(DirectoryNode & node)
     executor_.chroot(node);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ConfigSource
 
 prefix_ void senf::console::detail::ConfigSource::parse(RestrictedExecutor & executor)
@@ -109,7 +113,7 @@ prefix_ void senf::console::detail::ConfigSource::parse(RestrictedExecutor & exe
     v_parse(executor);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::BundleMixin
 
 prefix_ senf::console::detail::BundleMixin::BundleMixin()
@@ -146,7 +150,7 @@ prefix_ void senf::console::detail::BundleMixin::reset()
     bundle_.reset();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_