External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added const to argv type for better interoperability.

Browse Source
This commit is contained in:
Jesús González 2018-02-25 23:17:58 +01:00
parent e792760ab9
commit 7331af22ae
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/cxxopts.hpp
View File

@ -1079,7 +1079,7 @@ namespace cxxopts
ParseResult(
const std::unordered_map<std::string, std::shared_ptr<OptionDetails>>&,
std::vector<std::string>,
int&, char**&);
int&, const char**&);
size_t
count(const std::string& o) const
@ -1122,7 +1122,7 @@ namespace cxxopts
get_option(std::shared_ptr<OptionDetails>);
void
parse(int& argc, char**& argv);
parse(int& argc, const char**& argv);
void
add_to_option(const std::string& option, const std::string& arg);
@ -1145,7 +1145,7 @@ namespace cxxopts
checked_parse_arg
(
int argc,
char* argv[],
const char* argv[],
int& current,
std::shared_ptr<OptionDetails> value,
const std::string& name
@ -1197,7 +1197,7 @@ namespace cxxopts
}
ParseResult
parse(int& argc, char**& argv);
parse(int& argc, const char**& argv);
OptionAdder
add_options(std::string group = "");
@ -1415,7 +1415,7 @@ ParseResult::ParseResult
(
const std::unordered_map<std::string, std::shared_ptr<OptionDetails>>& options,
std::vector<std::string> positional,
int& argc, char**& argv
int& argc, const char**& argv
)
: m_options(options)
, m_positional(std::move(positional))
@ -1516,7 +1516,7 @@ void
ParseResult::checked_parse_arg
(
int argc,
char* argv[],
const char* argv[],
int& current,
std::shared_ptr<OptionDetails> value,
const std::string& name
@ -1623,7 +1623,7 @@ Options::parse_positional(std::initializer_list<std::string> options)
inline
ParseResult
Options::parse(int& argc, char**& argv)
Options::parse(int& argc, const char**& argv)
{
ParseResult result(m_options, m_positional, argc, argv);
return result;
@ -1631,7 +1631,7 @@ Options::parse(int& argc, char**& argv)
inline
void
ParseResult::parse(int& argc, char**& argv)
ParseResult::parse(int& argc, const char**& argv)
{
int current = 1;

2
src/example.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "cxxopts.hpp"
int main(int argc, char* argv[])
int main(int argc, const char* argv[])
{
try
{

2
test/catch.hpp
View File

@ -10280,7 +10280,7 @@ namespace Catch {
#ifndef __OBJC__
// Standard C/C++ main entry point
int main (int argc, char * argv[]) {
int main (int argc, const char * argv[]) {
return Catch::Session().run( argc, argv );
}

32
test/options.cpp
View File

@ -8,7 +8,7 @@ class Argv {
public:
Argv(std::initializer_list<const char*> args)
: m_argv(new char*[args.size()])
: m_argv(new const char*[args.size()])
, m_argc(args.size())
{
int i = 0;
@ -26,7 +26,7 @@ class Argv {
}
}
char** argv() const {
const char** argv() const {
return m_argv.get();
}
@ -36,8 +36,8 @@ class Argv {
private:
std::vector<std::unique_ptr<char[]>> m_args;
std::unique_ptr<char*[]> m_argv;
std::vector<std::unique_ptr<const char[]>> m_args;
std::unique_ptr<const char*[]> m_argv;
int m_argc;
};
@ -68,7 +68,7 @@ TEST_CASE("Basic options", "[options]")
"--space",
});
char** actual_argv = argv.argv();
const char** actual_argv = argv.argv();
auto argc = argv.argc();
auto result = options.parse(argc, actual_argv);
@ -122,7 +122,7 @@ TEST_CASE("No positional", "[positional]")
Argv av({"tester", "a", "b", "def"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);
@ -172,7 +172,7 @@ TEST_CASE("Some positional explicit", "[positional]")
Argv av({"tester", "--output", "a", "b", "c", "d"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);
@ -198,7 +198,7 @@ TEST_CASE("No positional with extras", "[positional]")
Argv av({"extras", "--", "a", "b", "c", "d"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto old_argv = argv;
@ -220,7 +220,7 @@ TEST_CASE("Empty with implicit value", "[implicit]")
Argv av({"implicit", "--implicit="});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);
@ -239,7 +239,7 @@ TEST_CASE("Default values", "[default]")
SECTION("Sets defaults") {
Argv av({"implicit"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);
@ -250,7 +250,7 @@ TEST_CASE("Default values", "[default]")
SECTION("When values provided") {
Argv av({"implicit", "--default", "5"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);
@ -285,7 +285,7 @@ TEST_CASE("Integers", "[options]")
Argv av({"ints", "--", "5", "6", "-6", "0", "0xab", "0xAf", "0x0"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
options.parse_positional("positional");
@ -312,7 +312,7 @@ TEST_CASE("Unsigned integers", "[options]")
Argv av({"ints", "--", "-2"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
options.parse_positional("positional");
@ -385,7 +385,7 @@ TEST_CASE("Floats", "[options]")
Argv av({"floats", "--double", "0.5", "--", "4", "-4", "1.5e6", "-1.5e6"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
options.parse_positional("positional");
@ -410,7 +410,7 @@ TEST_CASE("Invalid integers", "[integer]") {
Argv av({"ints", "--", "Ae"});
char **argv = av.argv();
const char **argv = av.argv();
auto argc = av.argc();
options.parse_positional("positional");
@ -433,7 +433,7 @@ TEST_CASE("Booleans", "[boolean]") {
Argv av({"booleans", "--bool=false", "--debug=true", "--timing", "extra"});
char** argv = av.argv();
const char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);