diff options
author | Taybin Rutkin <taybin@taybin.com> | 2007-04-07 21:34:17 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2007-04-07 21:34:17 +0000 |
commit | 7d1b3fc9b362c7a3731cef91852a08380c1987d8 (patch) | |
tree | 2a1cd81dc48c135dd3f1831645e1259bf8a2ece5 /libs/sigc++2 | |
parent | caca12c73f4a203cd496c4a50dec6eb4c4553110 (diff) |
Updated CoreAudioSource to compile again.
Renamed nil to nil_ throughout sigc++. It's a reserved word in ObjC and was interfering with compilation.
git-svn-id: svn://localhost/ardour2/trunk@1684 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/sigc++2')
-rw-r--r-- | libs/sigc++2/sigc++/adaptors/bind.h | 2 | ||||
-rw-r--r-- | libs/sigc++2/sigc++/adaptors/retype.h | 2 | ||||
-rw-r--r-- | libs/sigc++2/sigc++/functors/functor_trait.h | 6 | ||||
-rw-r--r-- | libs/sigc++2/sigc++/functors/slot.h | 72 | ||||
-rw-r--r-- | libs/sigc++2/sigc++/retype.h | 2 | ||||
-rw-r--r-- | libs/sigc++2/sigc++/signal.h | 208 |
6 files changed, 146 insertions, 146 deletions
diff --git a/libs/sigc++2/sigc++/adaptors/bind.h b/libs/sigc++2/sigc++/adaptors/bind.h index 81edaf7934..180a5f26e7 100644 --- a/libs/sigc++2/sigc++/adaptors/bind.h +++ b/libs/sigc++2/sigc++/adaptors/bind.h @@ -131,7 +131,7 @@ struct count_void<void,void,void,void,void,void,void> * * @ingroup bind */ -template <int I_location, class T_functor, class T_type1=nil,class T_type2=nil,class T_type3=nil,class T_type4=nil,class T_type5=nil,class T_type6=nil,class T_type7=nil> +template <int I_location, class T_functor, class T_type1=nil_,class T_type2=nil_,class T_type3=nil_,class T_type4=nil_,class T_type5=nil_,class T_type6=nil_,class T_type7=nil_> struct bind_functor; /** Adaptor that binds an argument to the wrapped functor. diff --git a/libs/sigc++2/sigc++/adaptors/retype.h b/libs/sigc++2/sigc++/adaptors/retype.h index 502959d3cd..01f71fcaa7 100644 --- a/libs/sigc++2/sigc++/adaptors/retype.h +++ b/libs/sigc++2/sigc++/adaptors/retype.h @@ -64,7 +64,7 @@ namespace sigc { * * @ingroup retype */ -template <class T_functor, class T_type1=nil,class T_type2=nil,class T_type3=nil,class T_type4=nil,class T_type5=nil,class T_type6=nil,class T_type7=nil> +template <class T_functor, class T_type1=nil_,class T_type2=nil_,class T_type3=nil_,class T_type4=nil_,class T_type5=nil_,class T_type6=nil_,class T_type7=nil_> struct retype_functor : public adapts<T_functor> { diff --git a/libs/sigc++2/sigc++/functors/functor_trait.h b/libs/sigc++2/sigc++/functors/functor_trait.h index 656d010414..0b7475273f 100644 --- a/libs/sigc++2/sigc++/functors/functor_trait.h +++ b/libs/sigc++2/sigc++/functors/functor_trait.h @@ -27,14 +27,14 @@ namespace sigc { -/** nil struct type. - * The nil struct type is used as default template argument in the +/** nil_ struct type. + * The nil_ struct type is used as default template argument in the * unnumbered sigc::signal and sigc::slot templates. * * @ingroup signal * @ingroup slot */ -struct nil; +struct nil_; /** @defgroup functors Functors diff --git a/libs/sigc++2/sigc++/functors/slot.h b/libs/sigc++2/sigc++/functors/slot.h index 51294fe4d8..48c192a3c3 100644 --- a/libs/sigc++2/sigc++/functors/slot.h +++ b/libs/sigc++2/sigc++/functors/slot.h @@ -468,7 +468,7 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -540,8 +540,8 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -615,9 +615,9 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -693,10 +693,10 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -774,11 +774,11 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -858,12 +858,12 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -945,13 +945,13 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -1037,13 +1037,13 @@ public: * * The template arguments determine the function signature of operator()(): * - @e T_return The return type of operator()(). - * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument. - * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument. + * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil_ means no argument. * * To use simply assign the slot to the desired functor. If the functor * is not compatible with the parameter list defined with the template @@ -1061,7 +1061,7 @@ public: * * @ingroup slot */ -template <class T_return, class T_arg1 = nil,class T_arg2 = nil,class T_arg3 = nil,class T_arg4 = nil,class T_arg5 = nil,class T_arg6 = nil,class T_arg7 = nil> +template <class T_return, class T_arg1 = nil_,class T_arg2 = nil_,class T_arg3 = nil_,class T_arg4 = nil_,class T_arg5 = nil_,class T_arg6 = nil_,class T_arg7 = nil_> class slot : public slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> { diff --git a/libs/sigc++2/sigc++/retype.h b/libs/sigc++2/sigc++/retype.h index 5df6622f84..069313573b 100644 --- a/libs/sigc++2/sigc++/retype.h +++ b/libs/sigc++2/sigc++/retype.h @@ -9,7 +9,7 @@ namespace SigC { -template <class T_functor, class T_return, class T_type1=::sigc::nil,class T_type2=::sigc::nil,class T_type3=::sigc::nil,class T_type4=::sigc::nil,class T_type5=::sigc::nil,class T_type6=::sigc::nil,class T_type7=::sigc::nil> +template <class T_functor, class T_return, class T_type1=::sigc::nil_,class T_type2=::sigc::nil_,class T_type3=::sigc::nil_,class T_type4=::sigc::nil_,class T_type5=::sigc::nil_,class T_type6=::sigc::nil_,class T_type7=::sigc::nil_> struct retype_slot_functor : public ::sigc::adapts<T_functor> { diff --git a/libs/sigc++2/sigc++/signal.h b/libs/sigc++2/sigc++/signal.h index a89112cf9e..9c4e35442a 100644 --- a/libs/sigc++2/sigc++/signal.h +++ b/libs/sigc++2/sigc++/signal.h @@ -407,7 +407,7 @@ private: * This template implements the emit() function of signal0. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_accumulator> struct signal_emit0 @@ -452,9 +452,9 @@ struct signal_emit0 * function for the case that no accumulator is used. */ template <class T_return> -struct signal_emit0<T_return, nil> +struct signal_emit0<T_return, nil_> { - typedef signal_emit0<T_return, nil > self_type; + typedef signal_emit0<T_return, nil_ > self_type; typedef T_return result_type; typedef slot<T_return> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -493,9 +493,9 @@ struct signal_emit0<T_return, nil> * return type is @p void. */ template <> -struct signal_emit0<void, nil> +struct signal_emit0<void, nil_> { - typedef signal_emit0<void, nil> self_type; + typedef signal_emit0<void, nil_> self_type; typedef void result_type; typedef slot<void> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -523,7 +523,7 @@ struct signal_emit0<void, nil> * This template implements the emit() function of signal1. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1, class T_accumulator> struct signal_emit1 @@ -577,9 +577,9 @@ struct signal_emit1 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1> -struct signal_emit1<T_return, T_arg1, nil> +struct signal_emit1<T_return, T_arg1, nil_> { - typedef signal_emit1<T_return, T_arg1, nil > self_type; + typedef signal_emit1<T_return, T_arg1, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -620,9 +620,9 @@ struct signal_emit1<T_return, T_arg1, nil> * return type is @p void. */ template <class T_arg1> -struct signal_emit1<void, T_arg1, nil> +struct signal_emit1<void, T_arg1, nil_> { - typedef signal_emit1<void, T_arg1, nil> self_type; + typedef signal_emit1<void, T_arg1, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -652,7 +652,7 @@ struct signal_emit1<void, T_arg1, nil> * This template implements the emit() function of signal2. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2, class T_accumulator> struct signal_emit2 @@ -708,9 +708,9 @@ struct signal_emit2 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2> -struct signal_emit2<T_return, T_arg1,T_arg2, nil> +struct signal_emit2<T_return, T_arg1,T_arg2, nil_> { - typedef signal_emit2<T_return, T_arg1,T_arg2, nil > self_type; + typedef signal_emit2<T_return, T_arg1,T_arg2, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -752,9 +752,9 @@ struct signal_emit2<T_return, T_arg1,T_arg2, nil> * return type is @p void. */ template <class T_arg1,class T_arg2> -struct signal_emit2<void, T_arg1,T_arg2, nil> +struct signal_emit2<void, T_arg1,T_arg2, nil_> { - typedef signal_emit2<void, T_arg1,T_arg2, nil> self_type; + typedef signal_emit2<void, T_arg1,T_arg2, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -785,7 +785,7 @@ struct signal_emit2<void, T_arg1,T_arg2, nil> * This template implements the emit() function of signal3. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator> struct signal_emit3 @@ -843,9 +843,9 @@ struct signal_emit3 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3> -struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil> +struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil_> { - typedef signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil > self_type; + typedef signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2,T_arg3> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -888,9 +888,9 @@ struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil> * return type is @p void. */ template <class T_arg1,class T_arg2,class T_arg3> -struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil> +struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil_> { - typedef signal_emit3<void, T_arg1,T_arg2,T_arg3, nil> self_type; + typedef signal_emit3<void, T_arg1,T_arg2,T_arg3, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2,T_arg3> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -922,7 +922,7 @@ struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil> * This template implements the emit() function of signal4. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator> struct signal_emit4 @@ -982,9 +982,9 @@ struct signal_emit4 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> -struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil> +struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_> { - typedef signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil > self_type; + typedef signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1028,9 +1028,9 @@ struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil> * return type is @p void. */ template <class T_arg1,class T_arg2,class T_arg3,class T_arg4> -struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil> +struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil_> { - typedef signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil> self_type; + typedef signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1063,7 +1063,7 @@ struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil> * This template implements the emit() function of signal5. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator> struct signal_emit5 @@ -1125,9 +1125,9 @@ struct signal_emit5 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> -struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> +struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_> { - typedef signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil > self_type; + typedef signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1172,9 +1172,9 @@ struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> * return type is @p void. */ template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> -struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> +struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_> { - typedef signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> self_type; + typedef signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1208,7 +1208,7 @@ struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> * This template implements the emit() function of signal6. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator> struct signal_emit6 @@ -1272,9 +1272,9 @@ struct signal_emit6 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> -struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> +struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_> { - typedef signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil > self_type; + typedef signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1320,9 +1320,9 @@ struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> * return type is @p void. */ template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> -struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> +struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_> { - typedef signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> self_type; + typedef signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1357,7 +1357,7 @@ struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> * This template implements the emit() function of signal7. * Template specializations are available to optimize signal * emission when no accumulator is used, i.e. the template - * argument @e T_accumulator is @p nil. + * argument @e T_accumulator is @p nil_. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator> struct signal_emit7 @@ -1423,9 +1423,9 @@ struct signal_emit7 * function for the case that no accumulator is used. */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> -struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> +struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_> { - typedef signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil > self_type; + typedef signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_ > self_type; typedef T_return result_type; typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1472,9 +1472,9 @@ struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, * return type is @p void. */ template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> -struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> +struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_> { - typedef signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> self_type; + typedef signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_> self_type; typedef void result_type; typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type; typedef signal_impl::const_iterator_type iterator_type; @@ -1529,13 +1529,13 @@ struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> * * The following template arguments are used: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_accumulator=nil> +template <class T_return, class T_accumulator=nil_> class signal0 : public signal_base { @@ -1575,7 +1575,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @return The accumulated return values of the slot invocations. @@ -1638,13 +1638,13 @@ public: * The following template arguments are used: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). * - @e T_arg1 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1, class T_accumulator=nil> +template <class T_return, class T_arg1, class T_accumulator=nil_> class signal1 : public signal_base { @@ -1684,7 +1684,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -1749,13 +1749,13 @@ public: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). * - @e T_arg1 Argument type used in the definition of emit(). * - @e T_arg2 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2, class T_accumulator=nil_> class signal2 : public signal_base { @@ -1795,7 +1795,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -1862,13 +1862,13 @@ public: * - @e T_arg1 Argument type used in the definition of emit(). * - @e T_arg2 Argument type used in the definition of emit(). * - @e T_arg3 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=nil_> class signal3 : public signal_base { @@ -1908,7 +1908,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -1977,13 +1977,13 @@ public: * - @e T_arg2 Argument type used in the definition of emit(). * - @e T_arg3 Argument type used in the definition of emit(). * - @e T_arg4 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=nil_> class signal4 : public signal_base { @@ -2023,7 +2023,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -2094,13 +2094,13 @@ public: * - @e T_arg3 Argument type used in the definition of emit(). * - @e T_arg4 Argument type used in the definition of emit(). * - @e T_arg5 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=nil_> class signal5 : public signal_base { @@ -2140,7 +2140,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -2213,13 +2213,13 @@ public: * - @e T_arg4 Argument type used in the definition of emit(). * - @e T_arg5 Argument type used in the definition of emit(). * - @e T_arg6 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=nil_> class signal6 : public signal_base { @@ -2259,7 +2259,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -2334,13 +2334,13 @@ public: * - @e T_arg5 Argument type used in the definition of emit(). * - @e T_arg6 Argument type used in the definition of emit(). * - @e T_arg7 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked. * * You should use the more convenient unnumbered sigc::signal template. * * @ingroup signal */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=nil_> class signal7 : public signal_base { @@ -2380,7 +2380,7 @@ public: * During signal emission all slots that have been connected * to the signal are invoked unless they are manually set into * a blocking state. The parameters are passed on to the slots. - * If @e T_accumulated is not @p nil, an accumulator of this type + * If @e T_accumulated is not @p nil_, an accumulator of this type * is used to process the return values of the slot invocations. * Otherwise, the return value of the last slot invoked is returned. * @param _A_a1 Argument to be passed on to the slots. @@ -2452,13 +2452,13 @@ public: * The template arguments determine the function signature of * the emit() function: * - @e T_return The desired return type of the emit() function. - * - @e T_arg1 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg2 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg3 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg4 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg5 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg6 Argument type used in the definition of emit(). The default @p nil means no argument. - * - @e T_arg7 Argument type used in the definition of emit(). The default @p nil means no argument. + * - @e T_arg1 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg2 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg3 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg4 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg5 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg6 Argument type used in the definition of emit(). The default @p nil_ means no argument. + * - @e T_arg7 Argument type used in the definition of emit(). The default @p nil_ means no argument. * * To specify an accumulator type the nested class signal::accumulated can be used. * @@ -2472,9 +2472,9 @@ public: * * @ingroup signal */ -template <class T_return, class T_arg1 = nil,class T_arg2 = nil,class T_arg3 = nil,class T_arg4 = nil,class T_arg5 = nil,class T_arg6 = nil,class T_arg7 = nil> +template <class T_return, class T_arg1 = nil_,class T_arg2 = nil_,class T_arg3 = nil_,class T_arg4 = nil_,class T_arg5 = nil_,class T_arg6 = nil_,class T_arg7 = nil_> class signal - : public signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> + : public signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_> { public: /** Convenience wrapper for the numbered sigc::signal# templates. @@ -2536,7 +2536,7 @@ public: signal() {} signal(const signal& src) - : signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>(src) {} + : signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_>(src) {} }; @@ -2547,7 +2547,7 @@ public: */ template <class T_return> class signal <T_return> - : public signal0<T_return, nil> + : public signal0<T_return, nil_> { public: @@ -2567,7 +2567,7 @@ public: signal() {} signal(const signal& src) - : signal0<T_return, nil>(src) {} + : signal0<T_return, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal1 template. @@ -2577,7 +2577,7 @@ public: */ template <class T_return, class T_arg1> class signal <T_return, T_arg1> - : public signal1<T_return, T_arg1, nil> + : public signal1<T_return, T_arg1, nil_> { public: @@ -2597,7 +2597,7 @@ public: signal() {} signal(const signal& src) - : signal1<T_return, T_arg1, nil>(src) {} + : signal1<T_return, T_arg1, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal2 template. @@ -2607,7 +2607,7 @@ public: */ template <class T_return, class T_arg1,class T_arg2> class signal <T_return, T_arg1,T_arg2> - : public signal2<T_return, T_arg1,T_arg2, nil> + : public signal2<T_return, T_arg1,T_arg2, nil_> { public: @@ -2627,7 +2627,7 @@ public: signal() {} signal(const signal& src) - : signal2<T_return, T_arg1,T_arg2, nil>(src) {} + : signal2<T_return, T_arg1,T_arg2, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal3 template. @@ -2637,7 +2637,7 @@ public: */ template <class T_return, class T_arg1,class T_arg2,class T_arg3> class signal <T_return, T_arg1,T_arg2,T_arg3> - : public signal3<T_return, T_arg1,T_arg2,T_arg3, nil> + : public signal3<T_return, T_arg1,T_arg2,T_arg3, nil_> { public: @@ -2657,7 +2657,7 @@ public: signal() {} signal(const signal& src) - : signal3<T_return, T_arg1,T_arg2,T_arg3, nil>(src) {} + : signal3<T_return, T_arg1,T_arg2,T_arg3, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal4 template. @@ -2667,7 +2667,7 @@ public: */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4> - : public signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil> + : public signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_> { public: @@ -2687,7 +2687,7 @@ public: signal() {} signal(const signal& src) - : signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil>(src) {} + : signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal5 template. @@ -2697,7 +2697,7 @@ public: */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> - : public signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> + : public signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_> { public: @@ -2717,7 +2717,7 @@ public: signal() {} signal(const signal& src) - : signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>(src) {} + : signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_>(src) {} }; /** Convenience wrapper for the numbered sigc::signal6 template. @@ -2727,7 +2727,7 @@ public: */ template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> - : public signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> + : public signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_> { public: @@ -2747,7 +2747,7 @@ public: signal() {} signal(const signal& src) - : signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>(src) {} + : signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_>(src) {} }; @@ -2780,12 +2780,12 @@ namespace SigC { * * The following template arguments are used: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_accumulator=::sigc::nil> +template <class T_return, class T_accumulator=::sigc::nil_> class Signal0 : public ::sigc::signal0<T_return, T_accumulator> { @@ -2830,12 +2830,12 @@ public: * The following template arguments are used: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). * - @e T_arg1 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1, class T_accumulator=::sigc::nil_> class Signal1 : public ::sigc::signal1<T_return, T_arg1, T_accumulator> { @@ -2881,12 +2881,12 @@ public: * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator). * - @e T_arg1 Argument type used in the definition of emit(). * - @e T_arg2 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2, class T_accumulator=::sigc::nil_> class Signal2 : public ::sigc::signal2<T_return, T_arg1,T_arg2, T_accumulator> { @@ -2933,12 +2933,12 @@ public: * - @e T_arg1 Argument type used in the definition of emit(). * - @e T_arg2 Argument type used in the definition of emit(). * - @e T_arg3 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=::sigc::nil_> class Signal3 : public ::sigc::signal3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator> { @@ -2986,12 +2986,12 @@ public: * - @e T_arg2 Argument type used in the definition of emit(). * - @e T_arg3 Argument type used in the definition of emit(). * - @e T_arg4 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=::sigc::nil_> class Signal4 : public ::sigc::signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator> { @@ -3040,12 +3040,12 @@ public: * - @e T_arg3 Argument type used in the definition of emit(). * - @e T_arg4 Argument type used in the definition of emit(). * - @e T_arg5 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=::sigc::nil_> class Signal5 : public ::sigc::signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator> { @@ -3095,12 +3095,12 @@ public: * - @e T_arg4 Argument type used in the definition of emit(). * - @e T_arg5 Argument type used in the definition of emit(). * - @e T_arg6 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=::sigc::nil_> class Signal6 : public ::sigc::signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator> { @@ -3151,12 +3151,12 @@ public: * - @e T_arg5 Argument type used in the definition of emit(). * - @e T_arg6 Argument type used in the definition of emit(). * - @e T_arg7 Argument type used in the definition of emit(). - * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. + * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked. * * @deprecated Use the unnumbered template sigc::signal instead. * @ingroup compat */ -template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=::sigc::nil> +template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=::sigc::nil_> class Signal7 : public ::sigc::signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator> { |