From fa06b4c141cbd64b8e7e088ac4568599553fb2cd Mon Sep 17 00:00:00 2001 From: florian <f.spreckelsen@inidscale.com> Date: Mon, 12 Jul 2021 12:21:51 +0200 Subject: [PATCH] WIP: Remove non-working wrappers and let it rest for now --- jlcaosdb/jlcaosdb.cxx | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/jlcaosdb/jlcaosdb.cxx b/jlcaosdb/jlcaosdb.cxx index 5fed1c2..88ed813 100644 --- a/jlcaosdb/jlcaosdb.cxx +++ b/jlcaosdb/jlcaosdb.cxx @@ -23,20 +23,28 @@ #include <string> #include <jlcxx/jlcxx.hpp> +#include <jlcxx/array.hpp> +#include <jlcxx/const_array.hpp> +#include <jlcxx/functions.hpp> +#include <jlcxx/module.hpp> +#include <jlcxx/smart_pointers.hpp> +#include <jlcxx/stl.hpp> +#include <jlcxx/tuple.hpp> +#include <jlcxx/type_conversion.hpp> #include "caosdb/authentication.h" #include "caosdb/connection.h" #include "caosdb/constants.h" #include "caosdb/exceptions.h" -namespace jlcxx -{ - template<> - struct SuperType<caosdb::authentication::PlainPasswordAuthenticator> - { - typedef caosdb::authentication::Authenticator type; - }; -} +// namespace jlcxx +// { +// template<> +// struct SuperType<caosdb::authentication::PlainPasswordAuthenticator> +// { +// typedef caosdb::authentication::Authenticator type; +// }; +// } JLCXX_MODULE define_julia_module(jlcxx::Module& mod) { @@ -57,8 +65,15 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& mod) // authenticators mod.add_type<caosdb::authentication::Authenticator>("CaosDBAuthenticator"); - mod.add_type<caosdb::authentication::PlainPasswordAuthenticator>("PlainPasswordAuthenticator", - jlcxx::julia_base_type<caosdb::authentication::Authenticator>()) - .constructor<const std::string&, const std::string&>() - .method("getCallCredentials", &caosdb::authentication::PlainPasswordAuthenticator::getCallCredentials); + // Currently not working, see https://github.com/JuliaInterop/CxxWrap.jl/issues/294 + // mod.add_type<caosdb::authentication::PlainPasswordAuthenticator>("PlainPasswordAuthenticator", + // jlcxx::julia_base_type<caosdb::authentication::Authenticator>()) + // .constructor<const std::string&, const std::string&>() + // .method("getCallCredentials", &caosdb::authentication::PlainPasswordAuthenticator::getCallCredentials); + + mod.add_type<caosdb::connection::CACertificateProvider>("CACertificateProvider"); + // TODO Add children once the above issue is resolved + + mod.add_type<caosdb::connection::CaosDBConnectionConfig>("CaosDBConnectionConfig"); + mod.add_type<caosdb::connection::InsecureCaosDBConnectionConfig>("InsecureCaosDBConnectionConfig"); } -- GitLab