minor fixes for clang++

[senf.git] / senf / Utils / Console / Parse.cc

diff --git a/senf/Utils/Console/Parse.cc b/senf/Utils/Console/Parse.cc
index cca6f69..e36c7c5 100644 (file)
--- a/senf/Utils/Console/Parse.cc
+++ b/senf/Utils/Console/Parse.cc
@@ -2,23 +2,28 @@
 //
 // 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 Parse non-inline non-template implementation */
@@ -292,9 +297,10 @@ namespace classic {
 #endif
 
     template <>
-    struct position_policy<senf::console::detail::FilePositionWithIndex>
+    class position_policy<senf::console::detail::FilePositionWithIndex>
         : public position_policy<file_position>
     {
+    public:
         typedef position_policy<file_position> Base;
 
         void next_line(senf::console::detail::FilePositionWithIndex & pos)
@@ -343,7 +349,7 @@ prefix_ Iterator senf::console::CommandParser::parseLoop(Iterator npb, Iterator
     detail::ParseDispatcher::BindInfo bind (impl().dispatcher, info);
     detail::boost_spirit::parse_info<PositionIterator> result;
 
-    for(;;) {
+    for (;;) {
         result = detail::boost_spirit::parse(
             b, e, * impl().grammar.use_parser<Impl::Grammar::SkipParser>());
         b = result.stop;
@@ -476,27 +482,27 @@ senf::console::CommandParser::parseIncremental(std::string const & commands, Cal
 
 prefix_ bool senf::console::CommandParser::isSpecialChar(char ch)
 {
-    return Impl::Grammar::special_p.test(ch);
+    return Impl::Grammar::special_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isPunctuationChar(char ch)
 {
-    return Impl::Grammar::punctuation_p.test(ch);
+    return Impl::Grammar::punctuation_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isSpaceChar(char ch)
 {
-    return Impl::Grammar::space_p.test(ch);
+    return Impl::Grammar::space_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isInvalidChar(char ch)
 {
-    return Impl::Grammar::invalid_p.test(ch);
+    return Impl::Grammar::invalid_p().test(ch);
 }
 
 prefix_ bool senf::console::CommandParser::isWordChar(char ch)
 {
-    return Impl::Grammar::word_p.test(ch);
+    return Impl::Grammar::word_p().test(ch);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////