Ticket #6991: po.patch

boost/program_options/detail/cmdline.hpp

@@ -107 +107 @@
         std::vector<option> parse_disguised_long_option(
             std::vector<std::string>& args);
         std::vector<option> parse_terminator(
-            std::vector<std::string>& args);
+            std::vector<std::string>& args, bool alwaysStop);
         std::vector<option> handle_additional_parser(
             std::vector<std::string>& args);
 

libs/program_options/src/cmdline.cpp

@@ -241 +241 @@
         if ((m_style & allow_short) && (m_style & allow_slash_for_short))
             style_parsers.push_back(boost::bind(&cmdline::parse_dos_option, this, _1));
 
-        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, _1));
+        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, _1, false /* or true for the behavior I want */));
 
         vector<option> result;
         while(!args.empty())
@@ -664 +664 @@
     }
 
     vector<option> 
-    cmdline::parse_terminator(vector<string>& args)
+    cmdline::parse_terminator(vector<string>& args, bool alwaysStop)
     {
         vector<option> result;
         const string& tok = args[0];
-        if (tok == "--")
+        if (tok == "--" || alwaysStop)
         {
-            for(unsigned i = 1; i < args.size(); ++i)
+            // Starting at index 1 skips the --.
+            unsigned start = tok == "--" ? 1 : 0;
+            for(unsigned i = start; i < args.size(); ++i)
             {
                 option opt;
                 opt.value.push_back(args[i]);