Merge pull request #423 from drufat/a

Use consistent indentation and typenames in numpy vectorize.

Merge pull request #423 from drufat/a
Use consistent indentation and typenames in numpy vectorize.
2d9220f0 · Wenzel Jakob · GitHub · 1ee4128c · c250ee51 · 2d9220f0
Commit 2d9220f0 authored Sep 22, 2016 by Wenzel Jakob Committed by GitHub Sep 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

include/pybind11/numpy.h include/pybind11/numpy.h +5 -4

No files found.
--- a/include/pybind11/numpy.h
+++ b/include/pybind11/numpy.h
@@ -911,10 +911,11 @@ detail::vectorize_helper<Return (*) (Args ...), Return, Args...> vectorize(Retur
    return vectorize<Return (*) (Args ...), Return, Args...>(f, f);
 }
-template <typename func> auto vectorize(func &&f) -> decltype(
+template <typename Func>
-        vectorize(std::forward<func>(f), (typename detail::remove_class<decltype(&std::remove_reference<func>::type::operator())>::type *) nullptr)) {
+auto vectorize(Func &&f) -> decltype(
-    return vectorize(std::forward<func>(f), (typename detail::remove_class<decltype(
+        vectorize(std::forward<Func>(f), (typename detail::remove_class<decltype(&std::remove_reference<Func>::type::operator())>::type *) nullptr)) {
-                   &std::remove_reference<func>::type::operator())>::type *) nullptr);
+    return vectorize(std::forward<Func>(f), (typename detail::remove_class<decltype(
+                   &std::remove_reference<Func>::type::operator())>::type *) nullptr);
 }
 NAMESPACE_END(pybind11)