commit 16eeec21f503fda93d86e199536c9a001edfee86
author David Tolnay <dtolnay@gmail.com> Tue Nov 10 19:10:06 2020 -0800
committer GitHub <noreply@github.com> Tue Nov 10 19:10:06 2020 -0800
tree baa878a3d6b33ce2668aef4bd61427644ef7844d
parent c1e475e7bb9b0acb279845ece94949e578845969
parent a5a1301058ac6d4d1422a9050a57ef14acfb49e4

Merge pull request #445 from dtolnay/fn

Provide rust::Fn call operator in generated header

gen/src/builtin.rs

diff --git a/gen/src/builtin.rs b/gen/src/builtin.rs
index f3240d0..8a25769 100644
--- a/gen/src/builtin.rs
+++ b/gen/src/builtin.rs
@@ -72,6 +72,10 @@
         builtin.unsafe_bitcopy = true;
     }
 
+    if builtin.rust_fn {
+        include.utility = true;
+    }
+
     if builtin.rust_error {
         include.exception = true;
         builtin.friend_impl = true;

include/cxx.h

diff --git a/include/cxx.h b/include/cxx.h
index b048e27..0313d34 100644
--- a/include/cxx.h
+++ b/include/cxx.h
@@ -215,7 +215,6 @@
 #endif // CXXBRIDGE05_RUST_VEC
 
 #ifndef CXXBRIDGE05_RUST_FN
-#define CXXBRIDGE05_RUST_FN
 template <typename Signature, bool Throws = false>
 class Fn;
 
@@ -316,6 +315,8 @@
 void panic [[noreturn]] (const char *msg);
 #endif // CXXBRIDGE05_PANIC
 
+#ifndef CXXBRIDGE05_RUST_FN
+#define CXXBRIDGE05_RUST_FN
 template <typename Ret, typename... Args, bool Throws>
 Ret Fn<Ret(Args...), Throws>::operator()(Args... args) const noexcept(!Throws) {
   return (*this->trampoline)(std::move(args)..., this->fn);
@@ -325,6 +326,7 @@
 Fn<Ret(Args...), Throws> Fn<Ret(Args...), Throws>::operator*() const noexcept {
   return *this;
 }
+#endif // CXXBRIDGE05_RUST_FN
 
 #ifndef CXXBRIDGE05_RUST_BITCOPY
 #define CXXBRIDGE05_RUST_BITCOPY