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

Fixed example and tests compilation

Browse Source
This commit is contained in:
Jesús González 2018-02-27 18:12:24 +01:00
parent cd22b9ee55
commit 1738ccbb55
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 );
}

26
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();
options.parse(argc, actual_argv);
@ -133,7 +133,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();
options.parse(argc, argv);
@ -183,7 +183,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();
options.parse(argc, argv);
@ -209,7 +209,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;
@ -231,7 +231,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();
options.parse(argc, argv);
@ -248,7 +248,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");
@ -274,7 +274,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");
@ -347,7 +347,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");
@ -372,7 +372,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");