diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_compose.cc | 6 | ||||
-rw-r--r-- | tests/test_hide.cc | 5 | ||||
-rw-r--r-- | tests/test_visit_each.cc | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/tests/test_compose.cc b/tests/test_compose.cc index 414947e..51f8e72 100644 --- a/tests/test_compose.cc +++ b/tests/test_compose.cc @@ -8,12 +8,6 @@ #include <sstream> #include <cstdlib> -// assume existance of T_functor::result_type for unknown functor types: -namespace sigc -{ -SIGC_FUNCTORS_HAVE_RESULT_TYPE -} - namespace { std::ostringstream result_stream; diff --git a/tests/test_hide.cc b/tests/test_hide.cc index 7f67688..e8724ab 100644 --- a/tests/test_hide.cc +++ b/tests/test_hide.cc @@ -39,11 +39,6 @@ struct foo_void : public sigc::functor_base } // end anonymous namespace -namespace sigc -{ -SIGC_FUNCTOR_TRAIT(foo, bool) -} - int main(int argc, char* argv[]) { diff --git a/tests/test_visit_each.cc b/tests/test_visit_each.cc index c47fca1..a22b620 100644 --- a/tests/test_visit_each.cc +++ b/tests/test_visit_each.cc @@ -84,9 +84,7 @@ namespace ns1 template <class T_functor> struct MyAdaptor1 : public sigc::adapts<T_functor> { - using result_type = typename sigc::functor_trait<T_functor>::result_type; - - result_type operator()() const + decltype(auto) operator()() const { result_stream << "MyAdaptor1()() "; return this->functor_(); |