fix merge

pybind · Jun 15, 2024 · fd47e28 · fd47e28
1 parent 800dbb2
commit fd47e28
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/include/pybind11/typing.h b/include/pybind11/typing.h
@@ -66,7 +66,9 @@ class Callable<Return(Args...)> : public function {
 template <typename T>
 class Type : public type {
     using type::type;
-} template <typename... Types>
+};
+
+template <typename... Types>
 class Union : public object {
     using object::object;
 };
@@ -137,7 +139,9 @@ struct handle_type_name<typing::Callable<Return(Args...)>> {
 template <typename T>
 struct handle_type_name<typing::Type<T>> {
     static constexpr auto name = const_name("type[") + make_caster<T>::name + const_name("]");
-} template <typename... Types>
+};
+
+template <typename... Types>
 struct handle_type_name<typing::Union<Types...>> {
     static constexpr auto name = const_name("Union[")
                                  + ::pybind11::detail::concat(make_caster<Types>::name...)