Change check_python_version call according to changes in c2py

flatironinstitute · Aug 2, 2024 · f571aba · f571aba
1 parent 8d1f024
commit f571aba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/clu/misc.hpp b/src/clu/misc.hpp
@@ -15,6 +15,8 @@ namespace clu {
   // Extract the name of a TemplateArgument. It is a bit tricky, so worth a function
   //
   str_t get_name_of_TemplateArgument(clang::TemplateArgument const &a, clang::ASTContext const *ctx);
+
+  // ---------- get_source_range_as_string ---------------------------
   // Given a source range, grab it as a string
   inline str_t get_source_range_as_string(clang::SourceRange const &sr, clang::ASTContext const *ctx) {
     return clang::Lexer::getSourceText(clang::CharSourceRange::getTokenRange(sr), ctx->getSourceManager(), ctx->getLangOpts()).str();

diff --git a/src/plugins/c2py/codegen/fnt.cpp b/src/plugins/c2py/codegen/fnt.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <numeric>
 #include "./fnt.hpp"
+#include "data.hpp"
 #include <fmt/core.h>
 #include <fmt/format.h>
 using namespace fmt::literals;
@@ -121,7 +122,7 @@ void codegen::write_dispatch(std::ostream &code, std::ostream &table, std::ostre
                              static auto const fun_{} = c2py::dispatcher_f_kw_t{{ )RAW",
                       pyname, fun_counter);
 
-  auto l = [&enforce_method, parent_class](auto &f_info) {
+  auto l = [&enforce_method, parent_class](fnt_info_t const &f_info) {
     auto *f    = f_info.ptr;
     auto *m    = llvm::dyn_cast_or_null<clang::CXXMethodDecl>(f);
     auto args  = fnt_params_with_default(f);

diff --git a/src/plugins/c2py/codegen/module.cpp b/src/plugins/c2py/codegen/module.cpp
@@ -76,7 +76,7 @@ static struct PyModuleDef module_def = {{
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_{modulename}() {{
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("{modulename}")) return NULL;
 
   // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H