boost/program_options
2
0
Fork 0
mirror of https://github.com/boostorg/program_options.git synced 2026-01-19 04:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Compile fix for MSVC 14

Browse Source 
Also fixes some new variable shadowing warnings
in cmdline_test with Visual C++ 14.
This commit is contained in:
Marcel Raad
2014-07-03 21:32:27 +02:00
committed by Vladimir Prus
parent 6e846597d5
commit 1a17f20532
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/program_options/detail/config_file.hpp
View File

@@ -82,7 +82,7 @@ namespace boost { namespace program_options { namespace detail {
void get();
#if BOOST_WORKAROUND(_MSC_VER, <= 1800)
#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
void decrement() {}
void advance(difference_type) {}
#endif

12
test/cmdline_test.cpp
View File

@@ -126,9 +126,9 @@ void test_cmdline(const char* syntax,
try {
vector<option> options = cmd.run();
for(unsigned i = 0; i < options.size(); ++i)
for(unsigned j = 0; j < options.size(); ++j)
{
option opt = options[i];
option opt = options[j];
if (opt.position_key != -1) {
if (!result.empty())
@@ -138,18 +138,18 @@ void test_cmdline(const char* syntax,
if (!result.empty())
result += " ";
result += opt.string_key + ":";
for (size_t j = 0; j < opt.value.size(); ++j) {
if (j != 0)
for (size_t k = 0; k < opt.value.size(); ++k) {
if (k != 0)
result += "-";
result += opt.value[j];
}
}
}
}
catch(unknown_option& e) {
catch(unknown_option&) {
status = s_unknown_option;
}
catch(ambiguous_option& e) {
catch(ambiguous_option&) {
status = s_ambiguous_option;
}
catch(invalid_command_line_syntax& e) {