[libsigcplusplus/variadic_mem_fun3: 112/148] Split functor_trait.h into functor_base.h and functor_trait.h.



commit 805f4b25b204f17e60d01a9b90ad0ffd4433fb35
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 4 11:17:48 2016 +0100

    Split functor_trait.h into functor_base.h and functor_trait.h.
    
    So that slot_base doesn't need to include so much.

 sigc++/filelist.am              |    1 +
 sigc++/functors/functor_base.h  |   15 +++++++++++++++
 sigc++/functors/functor_trait.h |    8 +-------
 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 3c3176e..5dd9098 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
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]