diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-03-04 11:17:48 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-03-04 11:17:48 +0100 |
| commit | c1d6c7408916d0ecbfdffb7c6ccbb60e15ecfbed (patch) | |
| tree | 37308fd137b306101eb5534be40cca4b5b05c00b | |
| parent | aa97c4beff958f3c34da4f7ff5eb0c5d31144847 (diff) | |
| download | sigc++-c1d6c7408916d0ecbfdffb7c6ccbb60e15ecfbed.tar.gz | |
Split functor_trait.h into functor_base.h and functor_trait.h.
So that slot_base doesn't need to include so much.
| -rw-r--r-- | sigc++/filelist.am | 1 | ||||
| -rw-r--r-- | sigc++/functors/functor_base.h | 15 | ||||
| -rw-r--r-- | sigc++/functors/functor_trait.h | 8 | ||||
| -rw-r--r-- | sigc++/functors/slot_base.h | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/sigc++/filelist.am b/sigc++/filelist.am index eb94725..31f9916 100644 --- a/sigc++/filelist.am +++ b/sigc++/filelist.am @@ -70,6 +70,7 @@ sigc_public_h = \ adaptors/hide.h \ adaptors/track_obj.h \ adaptors/retype_return.h \ + functors/functor_base.h \ functors/functor_trait.h \ functors/functors.h \ functors/ptr_fun.h \ diff --git a/sigc++/functors/functor_base.h b/sigc++/functors/functor_base.h new file mode 100644 index 0000000..0c5c0b8 --- /dev/null +++ b/sigc++/functors/functor_base.h @@ -0,0 +1,15 @@ +#ifndef _SIGC_FUNCTORS_FUNCTOR_BASE_H_ +#define _SIGC_FUNCTORS_FUNCTOR_BASE_H_ + +namespace sigc { + +/** A hint to the compiler. + * All functors which define @p result_type should publically inherit from this hint. + * + * @ingroup sigcfunctors + */ +struct functor_base {}; + + +} /* namespace sigc */ +#endif /* _SIGC_FUNCTORS_FUNCTOR_BASE_H_ */ diff --git a/sigc++/functors/functor_trait.h b/sigc++/functors/functor_trait.h index 24dfde6..f02ff39 100644 --- a/sigc++/functors/functor_trait.h +++ b/sigc++/functors/functor_trait.h @@ -1,5 +1,6 @@ #ifndef _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_ #define _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_ +#include <sigc++/functors/functor_base.h> #include <sigc++/type_traits.h> #include <type_traits> @@ -46,13 +47,6 @@ namespace sigc { * decltype(). That macro is now unneccesary and deprecated. */ -/** A hint to the compiler. - * All functors which define @p result_type should publically inherit from this hint. - * - * @ingroup sigcfunctors - */ -struct functor_base {}; - /** Helper class, to determine if decltype() can deduce the result type of a functor. * * @ingroup sigcfunctors diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h index 5516aa2..5c3042b 100644 --- a/sigc++/functors/slot_base.h +++ b/sigc++/functors/slot_base.h @@ -21,7 +21,7 @@ #include <sigc++config.h> #include <sigc++/trackable.h> -#include <sigc++/functors/functor_trait.h> +#include <sigc++/functors/functor_base.h> namespace sigc { |