From a6d0d6fac285c755a8e66061028b80de7c369ab0 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Thu, 23 Dec 2021 13:14:16 +0100 Subject: Second attempt to suit clang-format 10 Irritating that different versions of clang-format don't agree on what's an acceptable format, and that clang-format 10 is not easily installable on Ubuntu 21.10. --- sigc++/functors/mem_fun.h | 6 ++---- sigc++/functors/ptr_fun.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sigc++/functors/mem_fun.h b/sigc++/functors/mem_fun.h index 1ebccbb..07aee0b 100644 --- a/sigc++/functors/mem_fun.h +++ b/sigc++/functors/mem_fun.h @@ -187,8 +187,7 @@ struct visitor> * @ingroup mem_fun */ template -inline decltype(auto) -mem_fun(T_return (T_obj::*func)(T_arg...)) +inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...)) { return mem_functor(func); } @@ -213,8 +212,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const) * @ingroup mem_fun */ template -inline decltype(auto) -mem_fun(T_return (T_obj::*func)(T_arg...) volatile) +inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...) volatile) { return mem_functor(func); } diff --git a/sigc++/functors/ptr_fun.h b/sigc++/functors/ptr_fun.h index b80ccab..b188317 100644 --- a/sigc++/functors/ptr_fun.h +++ b/sigc++/functors/ptr_fun.h @@ -106,8 +106,7 @@ public: * @ingroup ptr_fun */ template -inline decltype(auto) -ptr_fun(T_return (*func)(T_args...)) +inline decltype(auto) ptr_fun(T_return (*func)(T_args...)) { return pointer_functor(func); } -- cgit v1.2.1