Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on LLVM-14. #107

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build on LLVM-14. #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "spdlog"]
path = spdlog
url = git@github.com:gabime/spdlog.git
url = https://github.com/gabime/spdlog.git
[submodule "json"]
path = json
url = git@github.com:nlohmann/json.git
url = https://github.com/nlohmann/json.git
[submodule "asttoc/fmt"]
path = asttoc/fmt
url = git@github.com:fmtlib/fmt.git
url = https://github.com/fmtlib/fmt.git
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ extern "C" {


## Quick start
You must have LLVM and clang 11.0.0 installed. To run the tests you'll need OpenEXR 2.5.5 installed. Other versions may work but the tests will fail as they rely on diffing the output, which will have the version numbers baked into the type names.
You must have LLVM and clang 14.0.0 installed. To run the tests you'll need OpenEXR 2.5.5 installed. Other versions may work but the tests will fail as they rely on diffing the output, which will have the version numbers baked into the type names.

### Checkout
The repository includes spdlog and nlohmann::json as submodules, so clone with `--recursive`:
Expand Down
2 changes: 1 addition & 1 deletion astgen/src/ast_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ mangle_template_args(const TemplateArgumentList& args) {
result.push_back("NullPtr");
} else if (arg.getKind() == TemplateArgument::ArgKind::Integral) {
result.push_back(
ps::replace(arg.getAsIntegral().toString(10), "-", "neg"));
ps::replace(std::to_string(arg.getAsIntegral().getExtValue()), "-", "neg"));
} else if (arg.getKind() == TemplateArgument::ArgKind::Template) {
result.push_back("Template");
} else if (arg.getKind() ==
Expand Down
5 changes: 3 additions & 2 deletions astgen/src/astgen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static cl::list<std::string>
int main(int argc_, const char** argv_) {
// set up logging
auto _console = spdlog::stdout_color_mt("console");
std::string cwd = fs::current_path();
const char* cwd = fs::current_path().c_str();

// FIXME: there's got to be a more sensible way of doing this but I can't
// figure it out...
Expand Down Expand Up @@ -143,7 +143,8 @@ int main(int argc_, const char** argv_) {
// grab any user-specified include directories from the command line
cppmm::PROJECT_INCLUDES = parse_project_includes(argc, argv, cwd);

CommonOptionsParser OptionsParser(argc, argv, CppmmCategory);
ExitOnError eoe;
CommonOptionsParser OptionsParser = eoe(CommonOptionsParser::create(argc, argv, CppmmCategory));

// Set up logging
switch (opt_verbosity) {
Expand Down
4 changes: 2 additions & 2 deletions astgen/src/process_binding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ void process_enum_decl(const EnumDecl* ed, std::string filename) {
for (const auto& ecd : ed->enumerators()) {
SPDLOG_DEBUG(" {}", ecd->getNameAsString());
variants.push_back(std::make_pair(ecd->getNameAsString(),
ecd->getInitVal().toString(10)));
std::to_string(ecd->getInitVal().getExtValue())));
}

std::vector<std::string> attrs = get_attrs(ed);
Expand Down Expand Up @@ -860,7 +860,7 @@ void process_library_enum_decl(const EnumDecl* ed, std::string filename,
for (const auto& ecd : ed->enumerators()) {
SPDLOG_DEBUG(" {}", ecd->getNameAsString());
variants.push_back(std::make_pair(ecd->getNameAsString(),
ecd->getInitVal().toString(10)));
std::to_string(ecd->getInitVal().getExtValue())));
}

NodeId new_id = NODES.size();
Expand Down
5 changes: 3 additions & 2 deletions genbind/src/genbind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@ void process_enum_decl(const EnumDecl* ed, std::string filename) {
for (const auto& ecd : ed->enumerators()) {
SPDLOG_DEBUG(" {}", ecd->getNameAsString());
variants.push_back(std::make_pair(ecd->getNameAsString(),
ecd->getInitVal().toString(10)));
std::to_string(ecd->getInitVal().getExtValue())));
}

NodeId new_id = NODES.size();
Expand Down Expand Up @@ -2402,7 +2402,8 @@ int main(int argc_, const char** argv_) {

project_includes = parse_project_includes(argc, argv);

CommonOptionsParser OptionsParser(argc, argv, CppmmCategory);
ExitOnError eoe;
CommonOptionsParser OptionsParser = eoe(CommonOptionsParser::create(argc, argv, CppmmCategory));

switch (opt_verbosity) {
case 0:
Expand Down