several fixes for clang/llvm

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

diff --git a/senf/Utils/Console/Parse.cc b/senf/Utils/Console/Parse.cc
index ff3bc51..e36c7c5 100644 (file)
--- a/senf/Utils/Console/Parse.cc
+++ b/senf/Utils/Console/Parse.cc
@@ -297,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)
@@ -481,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);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////