Ticket #7077: po.patch

libs\program_options\src\cmdline.cpp

@@ -246 +246 @@
         vector<option> result;
         while(!args.empty())
         {
             bool ok = false;
             for(unsigned i = 0; i < style_parsers.size(); ++i)
             {
-                unsigned current_size = args.size();
+                unsigned current_size = static_cast<unsigned>(args.size());
                 vector<option> next = style_parsers[i](args);
 
                 // Check that option names
                 // are valid, and that all values are in place.
                 if (!next.empty())
                 {
@@ -318 +318 @@
             if (min_tokens < max_tokens && opt.value.size() < max_tokens)
             {
                 // This option may grab some more tokens.
                 // We only allow to grab tokens that are not already
                 // recognized as key options.
 
-                int can_take_more = max_tokens - opt.value.size();
+                int can_take_more = max_tokens - static_cast<int>(opt.value.size());
                 unsigned j = i+1;
                 for (; can_take_more && j < result.size(); --can_take_more, ++j)
                 {
                     option& opt2 = result[j];
                     if (!opt2.string_key.empty())
                         break;
@@ -437 +437 @@
 
             // We don't check if those tokens look like option, or not!
 
             unsigned min_tokens = d.semantic()->min_tokens();
             unsigned max_tokens = d.semantic()->max_tokens();
 
-            unsigned present_tokens = opt.value.size() + other_tokens.size();
+            unsigned present_tokens = static_cast<unsigned>(opt.value.size() + other_tokens.size());
 
             if (present_tokens >= min_tokens)
             {
                 if (!opt.value.empty() && max_tokens == 0)
                 {
                     boost::throw_exception(
@@ -452 +452 @@
 
                 // If an option wants, at minimum, N tokens, we grab them there,
                 // when adding these tokens as values to current option we check
                 // if they look like options
                 if (opt.value.size() <= min_tokens)
                 {
-                    min_tokens -= opt.value.size();
+                    min_tokens -= static_cast<unsigned>(opt.value.size());
                 }
                 else
                 {
                     min_tokens = 0;
                 }
 

libs\program_options\src\options_description.cpp

@@ -466 +466 @@
                         }
                     }
 
                     // Take care to never increment the iterator past
                     // the end, since MSVC 8.0 (brokenly), assumes that
                     // doing that, even if no access happens, is a bug.
-                    unsigned remaining = distance(line_begin, par_end);
+                    unsigned remaining = static_cast<unsigned>(std::distance(line_begin, par_end));
                     string::const_iterator line_end = line_begin +
                         ((remaining < line_length) ? remaining : line_length);
 
                     // prevent chopped words
                     // Is line_end between two non-space characters?
                     if ((*(line_end - 1) != ' ') &&
@@ -486 +486 @@
                             .base();
 
                         if (last_space != line_begin)
                         {
                             // is last_space within the second half ot the
                             // current line
-                            if (static_cast<unsigned>(distance(last_space, line_end)) <
+                            if (static_cast<unsigned>(std::distance(last_space, line_end)) <
                                 (line_length / 2))
                             {
                                 line_end = last_space;
                             }
                         }
                     } // prevent chopped words
 
                     // write line to stream
                     copy(line_begin, line_end, ostream_iterator<char>(os));
 
                     if (first_line)
                     {
-                        indent += par_indent;
-                        line_length -= par_indent; // there's less to work with now
+                        indent += static_cast<unsigned>(par_indent);
+                        line_length -= static_cast<unsigned>(par_indent); // there's less to work with now
                         first_line = false;
                     }
 
                     // more lines to follow?
                     if (line_end != par_end)
                     {
@@ -589 +589 @@
                    os.put('\n'); // first column is too long, lets put description in new line
                    for (unsigned pad = first_column_width; pad > 0; --pad)
                    {
                       os.put(' ');
                    }
                 } else {
-                   for(unsigned pad = first_column_width - ss.str().size(); pad > 0; --pad)
+                   for(unsigned pad = first_column_width - static_cast<unsigned>(ss.str().size()); pad > 0; --pad)
                    {
                       os.put(' ');
                    }
                 }
 
                 format_description(os, opt.description(),

libs\program_options\src\positional_options.cpp

@@ -31 +31 @@
     }
 
     unsigned
     positional_options_description::max_total_count() const
     {
         return m_trailing.empty() ?
-          m_names.size() : (std::numeric_limits<unsigned>::max)();
+          static_cast<unsigned>(m_names.size()) : (std::numeric_limits<unsigned>::max)();
     }
 
     const std::string&
     positional_options_description::name_for_position(unsigned position) const
     {
         assert(position < max_total_count());

libs\program_options\src\winmain.cpp

@@ -86 +86 @@
 #ifndef BOOST_NO_STD_WSTRING
     BOOST_PROGRAM_OPTIONS_DECL std::vector<std::wstring>
     split_winmain(const std::wstring& cmdline)
     {
         std::vector<std::wstring> result;
         std::vector<std::string> aux = split_winmain(to_internal(cmdline));
-        for (unsigned i = 0, e = aux.size(); i < e; ++i)
+        for (unsigned i = 0, e = static_cast<unsigned>(aux.size()); i < e; ++i)
             result.push_back(from_utf8(aux[i]));
         return result;
     }
 #endif
 
 }}
 #endif