summaryrefslogtreecommitdiff
path: root/sigc++/adaptors
diff options
context:
space:
mode:
Diffstat (limited to 'sigc++/adaptors')
-rw-r--r--sigc++/adaptors/adaptor_trait.h17
-rw-r--r--sigc++/adaptors/adapts.h2
-rw-r--r--sigc++/adaptors/bind.h30
-rw-r--r--sigc++/adaptors/bind_return.h19
-rw-r--r--sigc++/adaptors/bound_argument.h20
-rw-r--r--sigc++/adaptors/compose.h31
-rw-r--r--sigc++/adaptors/exception_catch.h10
-rw-r--r--sigc++/adaptors/hide.h16
-rw-r--r--sigc++/adaptors/retype.h24
-rw-r--r--sigc++/adaptors/retype_return.h23
-rw-r--r--sigc++/adaptors/track_obj.h16
-rw-r--r--sigc++/adaptors/tuple_visitor_visit_each.h4
12 files changed, 102 insertions, 110 deletions
diff --git a/sigc++/adaptors/adaptor_trait.h b/sigc++/adaptors/adaptor_trait.h
index fe7f3e7..34ef401 100644
--- a/sigc++/adaptors/adaptor_trait.h
+++ b/sigc++/adaptors/adaptor_trait.h
@@ -82,7 +82,7 @@ namespace sigc
*
* @ingroup adaptors
*/
-template <typename T_functor>
+template<typename T_functor>
struct adaptor_functor : public adaptor_base
{
/** Invokes the wrapped functor passing on the arguments.
@@ -94,7 +94,7 @@ struct adaptor_functor : public adaptor_base
* @param arg Arguments to be passed on to the functor.
* @return The return value of the functor invocation.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... arg) const
{
return std::invoke(functor_, std::forward<T_arg>(arg)...);
@@ -112,7 +112,7 @@ struct adaptor_functor : public adaptor_base
* function pointer.
* @param type Pointer to function or class method to invoke from operator()().
*/
- template <typename T_type>
+ template<typename T_type>
explicit adaptor_functor(const T_type& type) : functor_(type)
{
}
@@ -129,10 +129,10 @@ struct adaptor_functor : public adaptor_base
*
* @ingroup adaptors
*/
-template <typename T_functor>
+template<typename T_functor>
struct visitor<adaptor_functor<T_functor>>
{
- template <typename T_action>
+ template<typename T_action>
static void do_visit_each(const T_action& action, const adaptor_functor<T_functor>& target)
{
sigc::visit_each(action, target.functor_);
@@ -149,15 +149,14 @@ struct visitor<adaptor_functor<T_functor>>
*
* @ingroup adaptors
*/
-template <typename T_functor, bool I_isadaptor = std::is_base_of<adaptor_base, T_functor>::value>
+template<typename T_functor, bool I_isadaptor = std::is_base_of<adaptor_base, T_functor>::value>
struct adaptor_trait;
-
/** Trait that specifies the adaptor version of a functor type.
* This template specialization is used for types that inherit from adaptor_base.
* adaptor_type is equal to @p T_functor in this case.
*/
-template <typename T_functor>
+template<typename T_functor>
struct adaptor_trait<T_functor, true>
{
using adaptor_type = T_functor;
@@ -169,7 +168,7 @@ struct adaptor_trait<T_functor, true>
* The latter are converted into @p pointer_functor or @p mem_functor types.
* adaptor_type is equal to @p adaptor_functor<functor_type>.
*/
-template <typename T_functor>
+template<typename T_functor>
struct adaptor_trait<T_functor, false>
{
private:
diff --git a/sigc++/adaptors/adapts.h b/sigc++/adaptors/adapts.h
index 959f152..08ae002 100644
--- a/sigc++/adaptors/adapts.h
+++ b/sigc++/adaptors/adapts.h
@@ -91,7 +91,7 @@ namespace sigc
*
* @ingroup adaptors
*/
-template <typename T_functor>
+template<typename T_functor>
struct adapts : public adaptor_base
{
private:
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
index 7c187d1..1d89ba0 100644
--- a/sigc++/adaptors/bind.h
+++ b/sigc++/adaptors/bind.h
@@ -102,7 +102,7 @@ namespace sigc
namespace internal
{
-template <typename T_element>
+template<typename T_element>
struct TransformEachInvoker
{
// We take T_element as non-const because invoke() is not const.
@@ -122,7 +122,7 @@ struct TransformEachInvoker
*
* @ingroup bind
*/
-template <int I_location, typename T_functor, typename... T_bound>
+template<int I_location, typename T_functor, typename... T_bound>
struct bind_functor : public adapts<T_functor>
{
/** Invokes the wrapped functor passing on the arguments.
@@ -130,7 +130,7 @@ struct bind_functor : public adapts<T_functor>
* @param arg Arguments to be passed on to the functor.
* @return The return value of the functor invocation.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... arg)
{
// For instance, if I_location is 1, and arg has 4 arguments,
@@ -171,7 +171,7 @@ struct bind_functor : public adapts<T_functor>
*
* @ingroup bind
*/
-template <typename T_functor, typename... T_type>
+template<typename T_functor, typename... T_type>
struct bind_functor<-1, T_functor, T_type...> : public adapts<T_functor>
{
public:
@@ -180,7 +180,7 @@ public:
* @param arg Arguments to be passed on to the functor.
* @return The return value of the functor invocation.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... arg)
{
// For instance, if arg has 4 arguments,
@@ -215,12 +215,12 @@ public:
*
* @ingroup bind
*/
-template <int T_loc, typename T_functor, typename... T_bound>
+template<int T_loc, typename T_functor, typename... T_bound>
struct visitor<bind_functor<T_loc, T_functor, T_bound...>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const bind_functor<T_loc, T_functor, T_bound...>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const bind_functor<T_loc, T_functor, T_bound...>& target)
{
sigc::visit_each(action, target.functor_);
sigc::visit_each(action, std::get<0>(target.bound_));
@@ -234,12 +234,12 @@ struct visitor<bind_functor<T_loc, T_functor, T_bound...>>
*
* @ingroup bind
*/
-template <typename T_functor, typename... T_type>
+template<typename T_functor, typename... T_type>
struct visitor<bind_functor<-1, T_functor, T_type...>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const bind_functor<-1, T_functor, T_type...>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const bind_functor<-1, T_functor, T_type...>& target)
{
sigc::visit_each(action, target.functor_);
@@ -260,7 +260,7 @@ struct visitor<bind_functor<-1, T_functor, T_type...>>
*
* @ingroup bind
*/
-template <int I_location, typename T_functor, typename... T_bound>
+template<int I_location, typename T_functor, typename... T_bound>
inline decltype(auto)
bind(const T_functor& func, T_bound... b)
{
@@ -277,7 +277,7 @@ bind(const T_functor& func, T_bound... b)
*
* @ingroup bind
*/
-template <typename T_functor, typename... T_type>
+template<typename T_functor, typename... T_type>
inline decltype(auto)
bind(const T_functor& func, T_type... b)
{
diff --git a/sigc++/adaptors/bind_return.h b/sigc++/adaptors/bind_return.h
index cb5a26a..b02f936 100644
--- a/sigc++/adaptors/bind_return.h
+++ b/sigc++/adaptors/bind_return.h
@@ -34,7 +34,7 @@ namespace sigc
*
* @ingroup bind
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
struct bind_return_functor : public adapts<T_functor>
{
/** Invokes the wrapped functor dropping its return value.
@@ -46,7 +46,7 @@ struct bind_return_functor : public adapts<T_functor>
* @param a Arguments to be passed on to the functor.
* @return The fixed return value.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
inline typename unwrap_reference<T_return>::type operator()(T_arg... a)
{
std::invoke(this->functor_, a...);
@@ -57,8 +57,7 @@ struct bind_return_functor : public adapts<T_functor>
* @param functor Functor to invoke from operator()().
* @param ret_value Value to return from operator()().
*/
- bind_return_functor(
- type_trait_take_t<T_functor> functor, type_trait_take_t<T_return> ret_value)
+ bind_return_functor(type_trait_take_t<T_functor> functor, type_trait_take_t<T_return> ret_value)
: adapts<T_functor>(functor), ret_value_(ret_value)
{
}
@@ -67,7 +66,7 @@ struct bind_return_functor : public adapts<T_functor>
bound_argument<T_return> ret_value_; // public, so that visit_each() can access it
};
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
typename unwrap_reference<T_return>::type
bind_return_functor<T_return, T_functor>::operator()()
{
@@ -83,12 +82,12 @@ bind_return_functor<T_return, T_functor>::operator()()
*
* @ingroup bind
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
struct visitor<bind_return_functor<T_return, T_functor>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const bind_return_functor<T_return, T_functor>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const bind_return_functor<T_return, T_functor>& target)
{
sigc::visit_each(action, target.ret_value_);
sigc::visit_each(action, target.functor_);
@@ -105,7 +104,7 @@ struct visitor<bind_return_functor<T_return, T_functor>>
*
* @ingroup bind
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
inline bind_return_functor<T_return, T_functor>
bind_return(const T_functor& functor, T_return ret_value)
{
diff --git a/sigc++/adaptors/bound_argument.h b/sigc++/adaptors/bound_argument.h
index a0ca6da..c9899df 100644
--- a/sigc++/adaptors/bound_argument.h
+++ b/sigc++/adaptors/bound_argument.h
@@ -46,7 +46,7 @@ namespace sigc
* The general template implementation is used for parameters that are passed by value.
* @e T_type The type of the bound argument.
*/
-template <typename T_type>
+template<typename T_type>
class bound_argument
{
public:
@@ -76,17 +76,14 @@ private:
* returned by bind_return() by reference, specialized for std::reference_wrapper<> types.
* @e T_wrapped The type of the bound argument.
*/
-template <typename T_wrapped>
+template<typename T_wrapped>
class bound_argument<std::reference_wrapper<T_wrapped>>
{
public:
/** Constructor.
* @param arg The argument to bind.
*/
- bound_argument(const std::reference_wrapper<T_wrapped>& arg)
- : visited_(unwrap(arg))
- {
- }
+ bound_argument(const std::reference_wrapper<T_wrapped>& arg) : visited_(unwrap(arg)) {}
/** Retrieve the entity to visit in visit_each().
* @return The limited_reference to the bound argument.
@@ -108,17 +105,14 @@ private:
* returned by bind_return() by const reference, specialized for const reference_wrapper<> types.
* - @e T_wrapped The type of the bound argument.
*/
-template <typename T_wrapped>
+template<typename T_wrapped>
class bound_argument<std::reference_wrapper<const T_wrapped>>
{
public:
/** Constructor.
* @param arg The argument to bind.
*/
- bound_argument(const std::reference_wrapper<const T_wrapped>& arg)
- : visited_(unwrap(arg))
- {
- }
+ bound_argument(const std::reference_wrapper<const T_wrapped>& arg) : visited_(unwrap(arg)) {}
/** Retrieve the entity to visit in visit_each().
* @return The const_limited_reference to the bound argument.
@@ -145,10 +139,10 @@ private:
* @param action The functor to invoke.
* @param arg The visited instance.
*/
-template <typename T_type>
+template<typename T_type>
struct visitor<bound_argument<T_type>>
{
- template <typename T_action>
+ template<typename T_action>
static void do_visit_each(const T_action& action, const bound_argument<T_type>& arg)
{
sigc::visit_each(action, arg.visit());
diff --git a/sigc++/adaptors/compose.h b/sigc++/adaptors/compose.h
index 5a3616f..3fadceb 100644
--- a/sigc++/adaptors/compose.h
+++ b/sigc++/adaptors/compose.h
@@ -59,10 +59,10 @@ namespace sigc
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter>
+template<typename T_setter, typename T_getter>
struct compose1_functor : public adapts<T_setter>
{
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... a)
{
return std::invoke(this->functor_, get_(std::forward<T_arg>(a)...));
@@ -91,10 +91,10 @@ struct compose1_functor : public adapts<T_setter>
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter1, typename T_getter2>
+template<typename T_setter, typename T_getter1, typename T_getter2>
struct compose2_functor : public adapts<T_setter>
{
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg... a)
{
return std::invoke(this->functor_, get1_(a...), get2_(a...));
@@ -106,8 +106,7 @@ struct compose2_functor : public adapts<T_setter>
* @param getter1 Functor to invoke from operator()().
* @param getter2 Functor to invoke from operator()().
*/
- compose2_functor(
- const T_setter& setter, const T_getter1& getter1, const T_getter2& getter2)
+ compose2_functor(const T_setter& setter, const T_getter1& getter1, const T_getter2& getter2)
: adapts<T_setter>(setter), get1_(getter1), get2_(getter2)
{
}
@@ -124,12 +123,12 @@ struct compose2_functor : public adapts<T_setter>
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter>
+template<typename T_setter, typename T_getter>
struct visitor<compose1_functor<T_setter, T_getter>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const compose1_functor<T_setter, T_getter>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const compose1_functor<T_setter, T_getter>& target)
{
sigc::visit_each(action, target.functor_);
sigc::visit_each(action, target.get_);
@@ -143,12 +142,12 @@ struct visitor<compose1_functor<T_setter, T_getter>>
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter1, typename T_getter2>
+template<typename T_setter, typename T_getter1, typename T_getter2>
struct visitor<compose2_functor<T_setter, T_getter1, T_getter2>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const compose2_functor<T_setter, T_getter1, T_getter2>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const compose2_functor<T_setter, T_getter1, T_getter2>& target)
{
sigc::visit_each(action, target.functor_);
sigc::visit_each(action, target.get1_);
@@ -166,7 +165,7 @@ struct visitor<compose2_functor<T_setter, T_getter1, T_getter2>>
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter>
+template<typename T_setter, typename T_getter>
inline compose1_functor<T_setter, T_getter>
compose(const T_setter& setter, const T_getter& getter)
{
@@ -184,7 +183,7 @@ compose(const T_setter& setter, const T_getter& getter)
*
* @ingroup compose
*/
-template <typename T_setter, typename T_getter1, typename T_getter2>
+template<typename T_setter, typename T_getter1, typename T_getter2>
inline compose2_functor<T_setter, T_getter1, T_getter2>
compose(const T_setter& setter, const T_getter1& getter1, const T_getter2& getter2)
{
diff --git a/sigc++/adaptors/exception_catch.h b/sigc++/adaptors/exception_catch.h
index ed60d0c..a7ccf9a 100644
--- a/sigc++/adaptors/exception_catch.h
+++ b/sigc++/adaptors/exception_catch.h
@@ -73,7 +73,7 @@ namespace sigc
* @ingroup adaptors
*/
-template <typename T_functor, typename T_catcher>
+template<typename T_functor, typename T_catcher>
struct exception_catch_functor : public adapts<T_functor>
{
decltype(auto) operator()()
@@ -88,7 +88,7 @@ struct exception_catch_functor : public adapts<T_functor>
}
}
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg... a)
{
try
@@ -111,10 +111,10 @@ struct exception_catch_functor : public adapts<T_functor>
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// template specialization of visitor<>::do_visit_each<>(action, functor):
-template <typename T_functor, typename T_catcher>
+template<typename T_functor, typename T_catcher>
struct visitor<exception_catch_functor<T_functor, T_catcher>>
{
- template <typename T_action>
+ template<typename T_action>
static void do_visit_each(const T_action& action,
const exception_catch_functor<T_functor, T_catcher>& target)
{
@@ -124,7 +124,7 @@ struct visitor<exception_catch_functor<T_functor, T_catcher>>
};
#endif // DOXYGEN_SHOULD_SKIP_THIS
-template <typename T_functor, typename T_catcher>
+template<typename T_functor, typename T_catcher>
inline decltype(auto)
exception_catch(const T_functor& func, const T_catcher& catcher)
{
diff --git a/sigc++/adaptors/hide.h b/sigc++/adaptors/hide.h
index 8d9d145..ac8a1a0 100644
--- a/sigc++/adaptors/hide.h
+++ b/sigc++/adaptors/hide.h
@@ -84,14 +84,14 @@ namespace sigc
*
* @ingroup hide
*/
-template <int I_location, typename T_functor>
+template<int I_location, typename T_functor>
struct hide_functor : public adapts<T_functor>
{
/** Invokes the wrapped functor, ignoring the argument at index @e I_location (0-indexed).
* @param a Arguments to be passed on to the functor, apart from the ignored argument.
* @return The return value of the functor invocation.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... a)
{
constexpr auto size = sizeof...(T_arg);
@@ -119,12 +119,12 @@ struct hide_functor : public adapts<T_functor>
*
* @ingroup hide
*/
-template <int I_location, typename T_functor>
+template<int I_location, typename T_functor>
struct visitor<hide_functor<I_location, T_functor>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const hide_functor<I_location, T_functor>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const hide_functor<I_location, T_functor>& target)
{
sigc::visit_each(action, target.functor_);
}
@@ -141,7 +141,7 @@ struct visitor<hide_functor<I_location, T_functor>>
*
* @ingroup hide
*/
-template <int I_location, typename T_functor>
+template<int I_location, typename T_functor>
inline decltype(auto)
hide(const T_functor& func)
{
@@ -157,7 +157,7 @@ hide(const T_functor& func)
*
* @ingroup hide
*/
-template <typename T_functor>
+template<typename T_functor>
inline decltype(auto)
hide(const T_functor& func)
{
diff --git a/sigc++/adaptors/retype.h b/sigc++/adaptors/retype.h
index a628f95..948fe5c 100644
--- a/sigc++/adaptors/retype.h
+++ b/sigc++/adaptors/retype.h
@@ -76,10 +76,10 @@ namespace sigc
*
* @ingroup retype
*/
-template <typename T_functor, typename... T_type>
+template<typename T_functor, typename... T_type>
struct retype_functor : public adapts<T_functor>
{
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg... a)
{
return std::invoke(this->functor_, static_cast<T_type>(a)...);
@@ -89,9 +89,7 @@ struct retype_functor : public adapts<T_functor>
* the functor.
* @param functor Functor to invoke from operator()().
*/
- explicit retype_functor(type_trait_take_t<T_functor> functor) : adapts<T_functor>(functor)
- {
- }
+ explicit retype_functor(type_trait_take_t<T_functor> functor) : adapts<T_functor>(functor) {}
};
#ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -102,12 +100,12 @@ struct retype_functor : public adapts<T_functor>
*
* @ingroup retype
*/
-template <typename T_functor, typename... T_type>
+template<typename T_functor, typename... T_type>
struct visitor<retype_functor<T_functor, T_type...>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const retype_functor<T_functor, T_type...>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const retype_functor<T_functor, T_type...>& target)
{
sigc::visit_each(action, target.functor_);
}
@@ -123,7 +121,9 @@ struct visitor<retype_functor<T_functor, T_type...>>
*
* @ingroup retype
*/
-template <template <typename T_func, typename... T_arg> class T_functor, typename T_func, typename... T_arg>
+template<template<typename T_func, typename... T_arg> class T_functor,
+ typename T_func,
+ typename... T_arg>
inline decltype(auto)
retype(const T_functor<T_func, T_arg...>& functor)
{
@@ -139,7 +139,9 @@ retype(const T_functor<T_func, T_arg...>& functor)
*
* @ingroup retype
*/
-template <template <typename T_return, typename... T_arg> class T_functor, typename T_return, typename... T_arg>
+template<template<typename T_return, typename... T_arg> class T_functor,
+ typename T_return,
+ typename... T_arg>
inline decltype(auto)
retype(const T_functor<T_return(T_arg...)>& functor)
{
diff --git a/sigc++/adaptors/retype_return.h b/sigc++/adaptors/retype_return.h
index 57959f9..e3911b8 100644
--- a/sigc++/adaptors/retype_return.h
+++ b/sigc++/adaptors/retype_return.h
@@ -33,10 +33,10 @@ namespace sigc
*
* @ingroup retype
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
struct retype_return_functor : public adapts<T_functor>
{
- template <typename... T_arg>
+ template<typename... T_arg>
inline T_return operator()(T_arg&&... a)
{
return T_return(std::invoke(this->functor_, std::forward<T_arg>(a)...));
@@ -48,8 +48,7 @@ struct retype_return_functor : public adapts<T_functor>
* the passed functor.
* @param functor Functor to invoke from operator()().
*/
- explicit retype_return_functor(type_trait_take_t<T_functor> functor)
- : adapts<T_functor>(functor)
+ explicit retype_return_functor(type_trait_take_t<T_functor> functor) : adapts<T_functor>(functor)
{
}
};
@@ -64,10 +63,10 @@ struct retype_return_functor : public adapts<T_functor>
*/
/* The void specialization is needed because of explicit cast to T_return.
*/
-template <typename T_functor>
+template<typename T_functor>
struct retype_return_functor<void, T_functor> : public adapts<T_functor>
{
- template <typename... T_arg>
+ template<typename... T_arg>
inline void operator()(T_arg... a)
{
std::invoke(this->functor_, a...);
@@ -85,12 +84,12 @@ struct retype_return_functor<void, T_functor> : public adapts<T_functor>
*
* @ingroup retype
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
struct visitor<retype_return_functor<T_return, T_functor>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const retype_return_functor<T_return, T_functor>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const retype_return_functor<T_return, T_functor>& target)
{
sigc::visit_each(action, target.functor_);
}
@@ -106,7 +105,7 @@ struct visitor<retype_return_functor<T_return, T_functor>>
*
* @ingroup retype
*/
-template <typename T_return, typename T_functor>
+template<typename T_return, typename T_functor>
inline retype_return_functor<T_return, T_functor>
retype_return(const T_functor& functor)
{
@@ -121,7 +120,7 @@ retype_return(const T_functor& functor)
*
* @ingroup hide
*/
-template <typename T_functor>
+template<typename T_functor>
inline retype_return_functor<void, T_functor>
hide_return(const T_functor& functor)
{
diff --git a/sigc++/adaptors/track_obj.h b/sigc++/adaptors/track_obj.h
index d894781..6f208f3 100644
--- a/sigc++/adaptors/track_obj.h
+++ b/sigc++/adaptors/track_obj.h
@@ -65,7 +65,7 @@ namespace sigc
*
* @ingroup track_obj
*/
-template <typename T_functor, typename... T_obj>
+template<typename T_functor, typename... T_obj>
class track_obj_functor : public adapts<T_functor>
{
public:
@@ -83,7 +83,7 @@ public:
* @param arg Arguments to be passed on to the functor.
* @return The return value of the functor invocation.
*/
- template <typename... T_arg>
+ template<typename... T_arg>
decltype(auto) operator()(T_arg&&... arg)
{
return std::invoke(this->functor_, std::forward<T_arg>(arg)...);
@@ -108,17 +108,17 @@ public:
*
* @ingroup track_obj
*/
-template <typename T_functor, typename... T_obj>
+template<typename T_functor, typename... T_obj>
struct visitor<track_obj_functor<T_functor, T_obj...>>
{
- template <typename T_action>
- static void do_visit_each(
- const T_action& action, const track_obj_functor<T_functor, T_obj...>& target)
+ template<typename T_action>
+ static void do_visit_each(const T_action& action,
+ const track_obj_functor<T_functor, T_obj...>& target)
{
sigc::visit_each(action, target.functor_);
// Call sigc::visit_each(action, element) on each element in the
- //target.obj_ tuple:
+ // target.obj_ tuple:
sigc::internal::tuple_for_each<internal::TupleVisitorVisitEach>(target.obj_, action);
}
};
@@ -133,7 +133,7 @@ struct visitor<track_obj_functor<T_functor, T_obj...>>
*
* @ingroup track_obj
*/
-template <typename T_functor, typename... T_obj>
+template<typename T_functor, typename... T_obj>
inline decltype(auto)
track_obj(const T_functor& func, const T_obj&... obj)
{
diff --git a/sigc++/adaptors/tuple_visitor_visit_each.h b/sigc++/adaptors/tuple_visitor_visit_each.h
index 5cccd49..60f977e 100644
--- a/sigc++/adaptors/tuple_visitor_visit_each.h
+++ b/sigc++/adaptors/tuple_visitor_visit_each.h
@@ -29,10 +29,10 @@ namespace internal
{
#ifndef DOXYGEN_SHOULD_SKIP_THIS
-template <typename T_element>
+template<typename T_element>
struct TupleVisitorVisitEach
{
- template <typename T_action>
+ template<typename T_action>
constexpr static void visit(const T_element& element, T_action&& action)
{
sigc::visit_each(std::forward<T_action>(action), element);