minor fixes for clang++

[senf.git] / senf / PPI / ModuleManager.cci

diff --git a/senf/PPI/ModuleManager.cci b/senf/PPI/ModuleManager.cci
index a71d72a..d273c3e 100644 (file)
--- a/senf/PPI/ModuleManager.cci
+++ b/senf/PPI/ModuleManager.cci
@@ -2,23 +2,28 @@
 //
 // 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
-// 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 ModuleManager inline non-template implementation */
@@ -27,9 +32,9 @@
 #include <algorithm>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::ModuleManager
 
 prefix_ senf::ppi::ModuleManager & senf::ppi::ModuleManager::instance()
@@ -55,7 +60,7 @@ prefix_ void senf::ppi::ModuleManager::registerInitializable(Initializable & i)
     initQueue_.push_back(&i);
     initRunner_.enable();
     // This call ensures, that the senf::ppi::init() handler is called as next handler
-    // after this handler returns (this works since the senf::ppi::init() handler is registered as 
+    // after this handler returns (this works since the senf::ppi::init() handler is registered as
     // PRE hook and thus has very high priority)
     senf::scheduler::yield();
 }
@@ -87,7 +92,7 @@ prefix_ senf::console::DirectoryNode & senf::ppi::ModuleManager::consoleDir()
     return consoleDir_.node();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::ModuleManager::Initializable
 
 prefix_ senf::ppi::ModuleManager::Initializable::Initializable()
@@ -116,14 +121,13 @@ prefix_ bool senf::ppi::ModuleManager::Initializable::initializationScheduled()
     return moduleManager().initializableRegistered(*this);
 }
 
-prefix_ senf::ppi::ModuleManager::ModuleManager &
-senf::ppi::ModuleManager::Initializable::moduleManager()
+prefix_ senf::ppi::ModuleManager & senf::ppi::ModuleManager::Initializable::moduleManager()
     const
 {
     return ModuleManager::instance();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f