diff --git a/Hazelnupp/CmdArgsInterface.cpp b/Hazelnupp/CmdArgsInterface.cpp index bfddafd..11f9bcb 100644 --- a/Hazelnupp/CmdArgsInterface.cpp +++ b/Hazelnupp/CmdArgsInterface.cpp @@ -72,7 +72,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) { std::cout << GenerateDocumentation() << std::endl << std::endl; std::cerr << "Parameter error: " << exc.What() << std::endl; - quick_exit(-1000); + exit(-1000); } else throw exc; // yeet @@ -83,7 +83,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) { std::cout << GenerateDocumentation() << std::endl << std::endl; std::cerr << "Parameter error: " << exc.What() << std::endl; - quick_exit(-1001); + exit(-1001); } else throw exc; // yeet @@ -94,7 +94,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) { std::cout << GenerateDocumentation() << std::endl << std::endl; std::cerr << "Parameter error: " << exc.What() << std::endl; - quick_exit(-1002); + exit(-1002); } else throw exc; // yeet @@ -105,7 +105,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) { std::cout << GenerateDocumentation() << std::endl << std::endl; std::cerr << "Parameter error: " << exc.What() << std::endl; - quick_exit(-1003); + exit(-1003); } else throw exc; // yeet @@ -116,7 +116,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) { std::cout << GenerateDocumentation() << std::endl << std::endl; std::cerr << "Parameter error: " << exc.What() << std::endl; - quick_exit(-1004); + exit(-1004); } else throw exc; // yeet @@ -126,7 +126,7 @@ void CmdArgsInterface::Parse(const int argc, const char* const* argv) if ((catchHelp) && (HasParam("--help"))) { std::cout << GenerateDocumentation() << std::endl; - quick_exit(0); + exit(0); } return; @@ -594,7 +594,7 @@ void CmdArgsInterface::ApplyConstraints() // Is ANY parameter present listed as incompatible with our current one? for (const std::string& incompatibility : pc.second.incompatibleParameters) - for (const std::pair& otherParam : parameters) + for (const auto& otherParam : parameters) { if (otherParam.first == incompatibility) throw HazelnuppConstraintIncompatibleParameters(pc.second.key, incompatibility); diff --git a/Hazelnupp/Version.h b/Hazelnupp/Version.h index 1fd5693..aa6ddc0 100644 --- a/Hazelnupp/Version.h +++ b/Hazelnupp/Version.h @@ -1,2 +1,2 @@ #pragma once -#define HAZELNUPP_VERSION (1.121) +#define HAZELNUPP_VERSION (1.122) diff --git a/Hazelnupp/VoidValue.h b/Hazelnupp/VoidValue.h index a67a503..fc6ff1b 100644 --- a/Hazelnupp/VoidValue.h +++ b/Hazelnupp/VoidValue.h @@ -31,6 +31,6 @@ namespace Hazelnp std::string GetString() const override; //! Returns an empty list - const std::vector& GetList() const; + const std::vector& GetList() const override; }; } diff --git a/INCLUDE/deggl b/INCLUDE/deggl old mode 100644 new mode 100755 index 2aefe97..3f86e49 Binary files a/INCLUDE/deggl and b/INCLUDE/deggl differ diff --git a/INCLUDE/generate.sh b/INCLUDE/generate.sh old mode 100644 new mode 100755 index 26796de..0aa9483 --- a/INCLUDE/generate.sh +++ b/INCLUDE/generate.sh @@ -1,7 +1,7 @@ # Build the include files echo "Building the include files..." -deggl -i ../Hazelnupp/*.cpp -o Hazelnupp +./deggl -i ../Hazelnupp/*.cpp -o Hazelnupp # Verify that they compile cleanly echo "Verifying that they compile" -g++ Hazelnupp.cpp -c -S -o - -Wall -Wextra -Wpedantic > /dev/null +g++ Hazelnupp.cpp -c -S -std=c++17 -o - -Wall -Wextra -Wpedantic > /dev/null