X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FConsole%2FParsedCommand.mpp;h=a8598faff0748b06e1a638209556ef7f7fa45860;hb=88a1eaae226bb958a6e6a7c42f24f7f9818f91be;hp=c5ffd18450dc2fbbf58e8bd2f1755c16a40cfcba;hpb=2da517bbcdb2af10d2322fc762ca27774b53b435;p=senf.git

diff --git a/Scheduler/Console/ParsedCommand.mpp b/Scheduler/Console/ParsedCommand.mpp
index c5ffd18..a8598fa 100644
--- a/Scheduler/Console/ParsedCommand.mpp
+++ b/Scheduler/Console/ParsedCommand.mpp
@@ -254,12 +254,13 @@ v_execute(std::ostream & os, ParseCommandInfo const & command)
 {
     // We NEED to know the number of arguments beforehand so we can assign default values
     // correctly ... hrmpf ...
-    unsigned nArgs ( command.arguments().size() );
+    unsigned nArgs ( std::distance(command.arguments().begin(), command.arguments().end()) );
     if ( nArgs > BOOST_PP_ITERATION() )
         throw SyntaxErrorException("invalid number of arguments");
     int nDefaults ( BOOST_PP_ITERATION() - nArgs );
+    (void) nDefaults;
 
-    typedef typename boost::range_const_reverse_iterator<ParseCommandInfo::ArgumentsRange>::type
+    typedef typename boost::range_reverse_iterator<const ParseCommandInfo::ArgumentsRange>::type
         riterator;
     riterator i (boost::rbegin(command.arguments()));
     riterator const i_end (boost::rend(command.arguments()));
@@ -293,12 +294,13 @@ v_execute(std::ostream & os, ParseCommandInfo const & command)
 {
     // We NEED to know the number of arguments beforehand so we can assign default values
     // correctly ... hrmpf ...
-    unsigned nArgs ( command.arguments().size() );
+    unsigned nArgs ( std::distance(command.arguments().begin(), command.arguments().end()) );
     if ( nArgs > BOOST_PP_ITERATION() )
         throw SyntaxErrorException("invalid number of arguments");
     int nDefaults ( BOOST_PP_ITERATION() - nArgs );
+    (void) nDefaults;
 
-    typedef typename boost::range_const_reverse_iterator<ParseCommandInfo::ArgumentsRange>::type
+    typedef typename boost::range_reverse_iterator<const ParseCommandInfo::ArgumentsRange>::type
         riterator;
     riterator i (boost::rbegin(command.arguments()));
     riterator const i_end (boost::rend(command.arguments()));
@@ -359,12 +361,18 @@ next_type arg ( BOOST_PP_ENUM_BINARY_PARAMS( BOOST_PP_ITERATION(), A, const & a
 // ////////////////////////////////////////////////////////////////////////
 // Undefine local Macros
 
+#undef mpp_TrailingBindArgs
+#undef mpp_BindArgs_
+
 #undef mpp_TrailingArgs
 #undef mpp_Args_
 
-#undef mpp_TrailingArgTypes
+#undef mpp_ArgTypes
 #undef mpp_ArgTypes_
 
+#undef mpp_TrailingArgTypes
+#undef mpp_TrailingArgTypes_
+
 #undef mpp_ArgN
 #undef mpp_ArgTypeN