Rename jl_function_t* to jl_value_t*

Ref: JuliaLang/julia#59216

Author: barche

.github/workflows/test-linux-mac.yml

@@ -59,7 +59,7 @@ jobs:
           CXXFLAGS=-ftemplate-backtrace-limit=0 cmake -DCMAKE_INSTALL_PREFIX=$HOME/install -DAPPEND_OVERRIDES_TOML=ON -DCMAKE_BUILD_TYPE=Debug ..
           VERBOSE=ON cmake --build . --config Debug --target install
           wget https://github.com/JuliaRegistries/General/raw/refs/heads/master/jll/L/libcxxwrap_julia_jll/Versions.toml
-          jllversion=$(grep '\["' Versions.toml | tail -n 1 | sed -E 's/\["([0-9]+\.[0-9]+\.[0-9]+)\+[^"]*"\]/\1/g')
+          jllversion=0.14.2 #$(grep '\["' Versions.toml | tail -n 1 | sed -E 's/\["([0-9]+\.[0-9]+\.[0-9]+)\+[^"]*"\]/\1/g')
           cd lib
           if [ ! -f libcxxwrap_julia.${jllversion}.dylib ]; then
             ln -s libcxxwrap_julia.*.*.*.* libcxxwrap_julia.${jllversion}.dylib

examples/functions.cpp

@@ -274,28 +274,28 @@ JLCXX_MODULE init_test_module(jlcxx::Module& mod)
     JL_GC_POP();
   });
 
-  mod.method("fn_clb2", [] (jl_function_t* f)
+  mod.method("fn_clb2", [] (jl_value_t* f)
   {
     std::vector<double> v{1., 2.};
     auto ar = jlcxx::ArrayRef<double, 1>(v.data(), v.size());
     jlcxx::JuliaFunction fnClb(f);
     fnClb((jl_value_t*)ar.wrapped(), std::wstring(L"calledFromCPP"));
   });
 
-  mod.method("callback_byval", [] (jl_function_t* f, int& result)
+  mod.method("callback_byval", [] (jl_value_t* f, int& result)
   {
     jlcxx::JuliaFunction juliafunc(f);
     juliafunc(BoxedNumber(1), result);
   });
 
-  mod.method("callback_byref", [] (jl_function_t* f, int& result)
+  mod.method("callback_byref", [] (jl_value_t* f, int& result)
   {
     jlcxx::JuliaFunction juliafunc(f);
     BoxedNumber n(2);
     juliafunc(n, result);
   });
 
-  mod.method("callback_byptr", [] (jl_function_t* f, int& result)
+  mod.method("callback_byptr", [] (jl_value_t* f, int& result)
   {
     jlcxx::JuliaFunction juliafunc(f);
     BoxedNumber n(3);

examples/inheritance.cpp

@@ -107,12 +107,12 @@ class VirtualCppJuliaExtended : public VirtualCpp
     return sum;
   }
 
-  void set_callback(jl_function_t* callback)
+  void set_callback(jl_value_t* callback)
   {
     m_callback = callback;
   }
 private:
-  jl_function_t* m_callback = nullptr;
+  jl_value_t* m_callback = nullptr;
 };
 
 class VirtualCfunctionExtended : public VirtualCpp

include/jlcxx/functions.hpp

@@ -19,10 +19,10 @@ class JLCXX_API JuliaFunction
   /// Construct using a function name and module name. Searches the current module by default. Throws if the function was not found.
   JuliaFunction(const std::string& name, const std::string& module_name = "");
   /// Construct directly from a pointer (throws if pointer is null)
-  JuliaFunction(jl_function_t* fpointer);
+  JuliaFunction(jl_value_t* fpointer);
 
   /// Access to the raw pointer
-  jl_function_t* pointer() const
+  jl_value_t* pointer() const
   {
     return m_function;
   }
@@ -61,7 +61,7 @@ class JLCXX_API JuliaFunction
     jl_value_t** m_arg_array;
     int m_i = 0;
   };
-  jl_function_t* m_function;
+  jl_value_t* m_function;
 };
 
 template<typename... ArgumentsT>

include/jlcxx/module.hpp

@@ -137,7 +137,7 @@ struct UpCast
 };
 
 // The CxxWrap Julia module
-extern jl_module_t* g_cxxwrap_module;
+extern JLCXX_API jl_module_t* g_cxxwrap_module;
 extern jl_datatype_t* g_cppfunctioninfo_type;
 
 class JLCXX_API Module;
@@ -704,7 +704,7 @@ class JLCXX_API Module
     auto labels_jl = ArrayRef<const char*>(&labels[0], nb_items);
     auto values_jl = ArrayRef<T>(&values[0], nb_items);
 
-    jl_function_t* add_enum_fn = jl_get_function(g_cxxwrap_module, "add_enum");
+    jl_value_t* add_enum_fn = jl_get_function(g_cxxwrap_module, "add_enum");
     if(add_enum_fn == nullptr)
     {
       throw std::runtime_error("CxxWrapCore.add_enum function not found, ensure you are using at least CxxWrap 0.17.3");

src/functions.cpp

@@ -38,7 +38,7 @@ JuliaFunction::JuliaFunction(const std::string& name, const std::string& module_
   }
 }
 
-JuliaFunction::JuliaFunction(jl_function_t* fpointer)
+JuliaFunction::JuliaFunction(jl_value_t* fpointer)
 {
   if(fpointer == nullptr)
   {

src/jlcxx.cpp

@@ -15,7 +15,7 @@ cxx_gc_roots_t& cxx_gc_roots()
   return m_roots;
 }
 
-jl_module_t* g_cxxwrap_module = nullptr;
+JLCXX_API jl_module_t* g_cxxwrap_module = nullptr;
 jl_datatype_t* g_cppfunctioninfo_type = nullptr;
 
 JLCXX_API void protect_from_gc(jl_value_t* v)