Revert "Added const to argv type for better interoperability. (#99)"

This reverts commit 0f819a5cab.
This commit is contained in:
Jarryd Beck
2018-04-10 08:48:08 +10:00
parent 0fe1dc892b
commit cc4914f065
3 changed files with 25 additions and 25 deletions
+16 -16
View File
@@ -8,7 +8,7 @@ class Argv {
public:
Argv(std::initializer_list<const char*> args)
: m_argv(new const char*[args.size()])
: m_argv(new char*[args.size()])
, m_argc(args.size())
{
int i = 0;
@@ -26,7 +26,7 @@ class Argv {
}
}
const char** argv() const {
char** argv() const {
return m_argv.get();
}
@@ -36,8 +36,8 @@ class Argv {
private:
std::vector<std::unique_ptr<const char[]>> m_args;
std::unique_ptr<const char*[]> m_argv;
std::vector<std::unique_ptr<char[]>> m_args;
std::unique_ptr<char*[]> m_argv;
int m_argc;
};
@@ -68,7 +68,7 @@ TEST_CASE("Basic options", "[options]")
"--space",
});
const char** actual_argv = argv.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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="});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char** argv = av.argv();
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"});
const char **argv = av.argv();
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"});
const char** argv = av.argv();
char** argv = av.argv();
auto argc = av.argc();
auto result = options.parse(argc, argv);