Fix compiler issues on macos

This commit is contained in:
Leonetienne 2022-02-08 09:35:21 +01:00
parent ef90b96a3b
commit f5a7687676
5 changed files with 11 additions and 11 deletions

View File

@ -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<std::string, Parameter*>& otherParam : parameters)
for (const auto& otherParam : parameters)
{
if (otherParam.first == incompatibility)
throw HazelnuppConstraintIncompatibleParameters(pc.second.key, incompatibility);

View File

@ -1,2 +1,2 @@
#pragma once
#define HAZELNUPP_VERSION (1.121)
#define HAZELNUPP_VERSION (1.122)

View File

@ -31,6 +31,6 @@ namespace Hazelnp
std::string GetString() const override;
//! Returns an empty list
const std::vector<Value*>& GetList() const;
const std::vector<Value*>& GetList() const override;
};
}

BIN
INCLUDE/deggl Normal file → Executable file

Binary file not shown.

4
INCLUDE/generate.sh Normal file → Executable file
View File

@ -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