diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-04-14 11:03:21 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-04-14 12:17:02 +0200 |
| commit | 9f6d41e4d51314ea30f077125d451d66f441c3b6 (patch) | |
| tree | 66f8b24ede6fbd3171275429969243ddd9c5edfc | |
| parent | 4cc45b2164f0a48bb04d37bcf5afdd81788bd41d (diff) | |
| download | glibmm-9f6d41e4d51314ea30f077125d451d66f441c3b6.tar.gz | |
Binding: TransformProp: Don't remove from functor_base.
Because it has been removed from the libsigc++-3.0 APi,
because it is no longer useful.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glib/src/binding.hg | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ba3281f0..a667b783 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ AS_IF([test "x$enable_static" = xyes], glibreq='2.0 >= 2.48.0' -GLIBMM_MODULES="sigc++-3.0 >= 2.9.1 glib-$glibreq gobject-$glibreq gmodule-$glibreq" +GLIBMM_MODULES="sigc++-3.0 >= 2.99.5 glib-$glibreq gobject-$glibreq gmodule-$glibreq" GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq" test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq" diff --git a/glib/src/binding.hg b/glib/src/binding.hg index cb53709e..730baadb 100644 --- a/glib/src/binding.hg +++ b/glib/src/binding.hg @@ -391,10 +391,9 @@ private: // The functor TransformProp can be implicitly converted to a SlotTransform // and used in a call to bind_property_value(). template <typename T_from, typename T_to> - class TransformProp : public sigc::functor_base + class TransformProp { public: - using result_type = bool; using SlotTypedTransform = sigc::slot<bool(const T_from&, T_to&)>; TransformProp(const SlotTypedTransform& slot) : typed_transform(slot) {} |