diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-12-23 13:14:16 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-12-23 13:14:16 +0100 |
| commit | a6d0d6fac285c755a8e66061028b80de7c369ab0 (patch) | |
| tree | 180049f2b80ebfe91178b5ef62cc8a231b49b357 | |
| parent | 783ad8239c03fbb44b3ed2c28282a43f849adafa (diff) | |
| download | sigc++-a6d0d6fac285c755a8e66061028b80de7c369ab0.tar.gz | |
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.
| -rw-r--r-- | sigc++/functors/mem_fun.h | 6 | ||||
| -rw-r--r-- | 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<bound_mem_functor<T_func, T_arg...>> * @ingroup mem_fun */ template<typename T_return, typename T_obj, typename... T_arg> -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<T_return (T_obj::*)(T_arg...), T_arg...>(func); } @@ -213,8 +212,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const) * @ingroup mem_fun */ template<typename T_return, typename T_obj, typename... T_arg> -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<T_return (T_obj::*)(T_arg...) volatile, T_arg...>(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<typename T_return, typename... T_args> -inline decltype(auto) -ptr_fun(T_return (*func)(T_args...)) +inline decltype(auto) ptr_fun(T_return (*func)(T_args...)) { return pointer_functor<T_return(T_args...)>(func); } |