Misc

robotpy_build/templates/cls_rpy_include.hpp.j2

@@ -16,8 +16,16 @@
 #pragma once
 #include <robotpy_build.h>
 
+{% for inc in data.extra_includes_first %}
+#include <{{ inc }}>
+{% endfor %}
+
 #include <{{ header.rel_fname }}>
 
+{% for inc in data.extra_includes %}
+#include <{{ inc }}>
+{% endfor %}
+
 {% if cls.x_has_trampoline %}
 {% include 'cls_trampoline.hpp.j2' %}
 {% endif %}

robotpy_build/templates/cls_trampoline.hpp.j2

@@ -115,7 +115,7 @@ struct Py{{ cls.x_qualname_ }} : CxxBase {
     {%- else -%}
         PYBIND11_OVERLOAD_NAME(
     {%- endif -%}
-        {{ fn.rtnType }}, CxxBase, "{{ fn.x_name }}", {{ fn.name }},{{ fn.parameters | join(', ', attribute='name') }});
+        PYBIND11_TYPE({{ fn.rtnType }}), CxxBase, "{{ fn.x_name }}", {{ fn.name }},{{ fn.parameters | join(', ', attribute='name') }});
     {%- endif %}
     }
 #endif

tests/cpp/pyproject.toml.tmpl

@@ -45,6 +45,7 @@ generate = [
     { static_only = "static_only.h" },
     { type_caster = "type_caster.h" },
     { type_caster_nested = "type_caster_nested.h" },
+    { virtual_comma = "virtual_comma.h" },
     { virtual_xform = "virtual_xform.h" },
 
     # Inheritance

tests/cpp/rpytest/ft/include/virtual_comma.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <utility>
+
+struct VirtualComma
+{
+    virtual ~VirtualComma() {}
+
+    virtual std::pair<int, int> getTwoTwo()
+    {
+        return std::pair<int, int>{1, 2};
+    }
+};