tests: Remove unnecessary result_type aliases

murraycu · murraycu · commit e04825847c4b · 2019-10-29T10:49:13.000+01:00
This was necessary with older pre-C++11 versions of libsigc++.
diff --git a/tests/test_accum_iter.cc b/tests/test_accum_iter.cc
@@ -19,8 +19,6 @@ ident(int i)
 template<typename T>
 struct min_accum
 {
-  using result_type = T;
-
   template<typename I>
   decltype(auto) operator()(I i1, I i2)
   {
diff --git a/tests/test_accumulated.cc b/tests/test_accumulated.cc
@@ -16,7 +16,6 @@ std::ostringstream result_stream;
 
 struct arithmetic_mean_accumulator
 {
-  using result_type = double;
   template<typename T_iterator>
   double operator()(T_iterator first, T_iterator last) const
   {
@@ -31,11 +30,10 @@ struct arithmetic_mean_accumulator
 template<typename Ret>
 struct vector_accumulator
 {
-  using result_type = std::vector<Ret>;
   template<typename T_iterator>
-  result_type operator()(T_iterator first, T_iterator last) const
+  std::vector<Ret> operator()(T_iterator first, T_iterator last) const
   {
-    result_type vec;
+    std::vector<Ret> vec;
     for (; first != last; ++first)
       vec.push_back(*first);
     return vec;
diff --git a/tests/test_bind.cc b/tests/test_bind.cc
@@ -12,9 +12,6 @@ std::ostringstream result_stream;
 
 struct foo
 {
-  // choose a type that can hold all return values
-  using result_type = int;
-
   int operator()(int i)
   {
     result_stream << "foo(int " << i << ") ";
@@ -36,8 +33,6 @@ struct foo
 
 struct foo_void
 {
-  using result_type = void;
-
   void operator()(int i) { result_stream << "foo_void(int " << i << ")"; }
 };
 
diff --git a/tests/test_compose.cc b/tests/test_compose.cc
@@ -11,9 +11,6 @@ std::ostringstream result_stream;
 
 struct set
 {
-  // choose a type that can hold all return values
-  using result_type = double;
-
   double operator()(int i)
   {
     result_stream << "set(int " << i << ") ";
@@ -29,8 +26,6 @@ struct set
 
 struct set_void
 {
-  using result_type = void;
-
   void operator()(double i) { result_stream << "set_void(double " << i << ")"; }
 };
 
@@ -55,9 +50,6 @@ struct get
     return double(i) / double(j);
   }
 #else
-  // choose a type that can hold all return values
-  using result_type = double;
-
   double operator()()
   {
     result_stream << "get() ";
diff --git a/tests/test_exception_catch.cc b/tests/test_exception_catch.cc
@@ -11,8 +11,6 @@ std::ostringstream result_stream;
 
 struct f
 {
-  using result_type = int;
-
   int operator()(int i)
   {
     result_stream << "f(int " << i << ") ";
@@ -22,8 +20,6 @@ struct f
 
 struct g
 {
-  using result_type = int;
-
   int operator()()
   {
     result_stream << "g() ";
@@ -33,8 +29,6 @@ struct g
 
 struct g_void
 {
-  using result_type = void;
-
   void operator()()
   {
     result_stream << "g_void() ";
diff --git a/tests/test_hide.cc b/tests/test_hide.cc
@@ -11,9 +11,6 @@ std::ostringstream result_stream;
 
 struct foo
 {
-  // choose a type that can hold all return values
-  using result_type = int;
-
   int operator()()
   {
     result_stream << "foo() ";
@@ -29,8 +26,6 @@ struct foo
 
 struct foo_void
 {
-  using result_type = void;
-
   void operator()() { result_stream << "foo_void()"; }
 };
 
diff --git a/tests/test_retype_return.cc b/tests/test_retype_return.cc
@@ -12,8 +12,6 @@ std::ostringstream result_stream;
 
 struct foo
 {
-  using result_type = float;
-
   float operator()(int i)
   {
     result_stream << "foo(int " << i << ") ";
@@ -29,8 +27,6 @@ struct foo
 
 struct bar : public sigc::trackable
 {
-  using result_type = int;
-
   int operator()(int i)
   {
     result_stream << "bar(int " << i << ")";
diff --git a/tests/test_track_obj.cc b/tests/test_track_obj.cc
@@ -52,8 +52,6 @@ struct bar_group4 : public sigc::trackable
 class Functor1
 {
 public:
-  using result_type = std::string;
-
   explicit Functor1(const bar_group4& bar) : bar_(bar) {}
 
   std::string operator()(int i) { return (i < 0) ? "negative" : ((i > 0) ? "positive" : "zero"); }
@@ -66,8 +64,6 @@ class Functor1
 class Functor2
 {
 public:
-  using result_type = std::string;
-
   Functor2(const bar_group4& bar, const book& aBook) : bar_(bar), aBook_(aBook) {}
 
   std::string operator()(int i, const std::string& str) const

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ ident(int i)`
`19`	`19`	`template<typename T>`
`20`	`20`	`struct min_accum`
`21`	`21`	`{`
`22`		`- using result_type = T;`
`23`		`-`
`24`	`22`	`template<typename I>`
`25`	`23`	`decltype(auto) operator()(I i1, I i2)`
`26`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ std::ostringstream result_stream;`
`16`	`16`
`17`	`17`	`struct arithmetic_mean_accumulator`
`18`	`18`	`{`
`19`		`- using result_type = double;`
`20`	`19`	`template<typename T_iterator>`
`21`	`20`	`double operator()(T_iterator first, T_iterator last) const`
`22`	`21`	`{`
`@@ -31,11 +30,10 @@ struct arithmetic_mean_accumulator`
`31`	`30`	`template<typename Ret>`
`32`	`31`	`struct vector_accumulator`
`33`	`32`	`{`
`34`		`- using result_type = std::vector<Ret>;`
`35`	`33`	`template<typename T_iterator>`
`36`		`- result_type operator()(T_iterator first, T_iterator last) const`
	`34`	`+ std::vector<Ret> operator()(T_iterator first, T_iterator last) const`
`37`	`35`	`{`
`38`		`- result_type vec;`
	`36`	`+ std::vector<Ret> vec;`
`39`	`37`	`for (; first != last; ++first)`
`40`	`38`	`vec.push_back(*first);`
`41`	`39`	`return vec;`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,6 @@ std::ostringstream result_stream;`
`12`	`12`
`13`	`13`	`struct foo`
`14`	`14`	`{`
`15`		`- // choose a type that can hold all return values`
`16`		`- using result_type = int;`
`17`		`-`
`18`	`15`	`int operator()(int i)`
`19`	`16`	`{`
`20`	`17`	`result_stream << "foo(int " << i << ") ";`
`@@ -36,8 +33,6 @@ struct foo`
`36`	`33`
`37`	`34`	`struct foo_void`
`38`	`35`	`{`
`39`		`- using result_type = void;`
`40`		`-`
`41`	`36`	`void operator()(int i) { result_stream << "foo_void(int " << i << ")"; }`
`42`	`37`	`};`
`43`	`38`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@ std::ostringstream result_stream;`
`11`	`11`
`12`	`12`	`struct set`
`13`	`13`	`{`
`14`		`- // choose a type that can hold all return values`
`15`		`- using result_type = double;`
`16`		`-`
`17`	`14`	`double operator()(int i)`
`18`	`15`	`{`
`19`	`16`	`result_stream << "set(int " << i << ") ";`
`@@ -29,8 +26,6 @@ struct set`
`29`	`26`
`30`	`27`	`struct set_void`
`31`	`28`	`{`
`32`		`- using result_type = void;`
`33`		`-`
`34`	`29`	`void operator()(double i) { result_stream << "set_void(double " << i << ")"; }`
`35`	`30`	`};`
`36`	`31`
`@@ -55,9 +50,6 @@ struct get`
`55`	`50`	`return double(i) / double(j);`
`56`	`51`	`}`
`57`	`52`	`#else`
`58`		`- // choose a type that can hold all return values`
`59`		`- using result_type = double;`
`60`		`-`
`61`	`53`	`double operator()()`
`62`	`54`	`{`
`63`	`55`	`result_stream << "get() ";`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ std::ostringstream result_stream;`
`11`	`11`
`12`	`12`	`struct f`
`13`	`13`	`{`
`14`		`- using result_type = int;`
`15`		`-`
`16`	`14`	`int operator()(int i)`
`17`	`15`	`{`
`18`	`16`	`result_stream << "f(int " << i << ") ";`
`@@ -22,8 +20,6 @@ struct f`
`22`	`20`
`23`	`21`	`struct g`
`24`	`22`	`{`
`25`		`- using result_type = int;`
`26`		`-`
`27`	`23`	`int operator()()`
`28`	`24`	`{`
`29`	`25`	`result_stream << "g() ";`
`@@ -33,8 +29,6 @@ struct g`
`33`	`29`
`34`	`30`	`struct g_void`
`35`	`31`	`{`
`36`		`- using result_type = void;`
`37`		`-`
`38`	`32`	`void operator()()`
`39`	`33`	`{`
`40`	`34`	`result_stream << "g_void() ";`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ std::ostringstream result_stream;`
`12`	`12`
`13`	`13`	`struct foo`
`14`	`14`	`{`
`15`		`- using result_type = float;`
`16`		`-`
`17`	`15`	`float operator()(int i)`
`18`	`16`	`{`
`19`	`17`	`result_stream << "foo(int " << i << ") ";`
`@@ -29,8 +27,6 @@ struct foo`
`29`	`27`
`30`	`28`	`struct bar : public sigc::trackable`
`31`	`29`	`{`
`32`		`- using result_type = int;`
`33`		`-`
`34`	`30`	`int operator()(int i)`
`35`	`31`	`{`
`36`	`32`	`result_stream << "bar(int " << i << ")";`