minor fixes for clang++

[senf.git] / senf / Utils / Console / ProgramOptions.ih

diff --git a/senf/Utils/Console/ProgramOptions.ih b/senf/Utils/Console/ProgramOptions.ih
index 7bbbf0c..2c7bd37 100644 (file)
--- a/senf/Utils/Console/ProgramOptions.ih
+++ b/senf/Utils/Console/ProgramOptions.ih
@@ -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 ProgramOptions internal header */
@@ -30,12 +35,12 @@
 #include <boost/scoped_ptr.hpp>
 #include "Parse.hh"
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
 namespace detail {
-    
+
 #ifndef DOXYGEN
 
     class ProgramOptionsSource : public ConfigSource
@@ -48,10 +53,10 @@ namespace detail {
         template <class Container>
         ProgramOptionsSource & nonOptions(Container & container);
         ProgramOptionsSource & alias(char letter, std::string const & longOpt, bool withArg=false);
-        
+
     private:
         ProgramOptionsSource(int argc, char const ** argv);
-        
+
         virtual void v_parse(RestrictedExecutor & executor);
 
         void parseLongOption(std::string const & arg, RestrictedExecutor & executor);
@@ -84,7 +89,7 @@ namespace detail {
         };
 
         typedef std::map<char, ShortOption> ShortOptions;
-        
+
         int argc_;
         char const ** argv_;
         CommandParser parser_;
@@ -96,7 +101,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f