sigc++/adaptors/bind.h: Make bind_functor::bound_ public

kjellahl · kjellahl · commit 051d1cab888a · 2019-10-27T12:09:22.000+01:00
It's used by sigc::visitor::do_visit_each(). Add a test case in tests/test_bind.cc. Fixes #26
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
@@ -161,7 +161,7 @@ struct bind_functor : public adapts<T_functor>
   {
   }
 
-private:
+  // public to avoid template friend declarations (used by visitor::do_visit_each())
   /// The arguments bound to the functor.
   std::tuple<bound_argument<T_bound>...> bound_;
 };
@@ -202,6 +202,7 @@ struct bind_functor<-1, T_functor, T_type...> : public adapts<T_functor>
   {
   }
 
+  // public to avoid template friend declarations (used by visitor::do_visit_each())
   /// The argument bound to the functor.
   std::tuple<bound_argument<T_type>...> bound_;
 };
diff --git a/tests/test_bind.cc b/tests/test_bind.cc
@@ -146,11 +146,19 @@ main(int argc, char* argv[])
 
   sigc::slot<void()> sl;
   {
+    // Test without a positional template argument to std::bind().
     book guest_book("karl");
     sl = sigc::bind(&egon, std::ref(guest_book));
     sl();
     result_stream << " " << static_cast<std::string&>(guest_book);
     util->check_result(result_stream, "egon(string 'karl') egon was here");
+
+    // Test with a positional template argument to std::bind<>().
+    guest_book.get_name() = "ove";
+    sl = sigc::bind<0>(&egon, std::ref(guest_book));
+    sl();
+    result_stream << " " << static_cast<std::string&>(guest_book);
+    util->check_result(result_stream, "egon(string 'ove') egon was here");
   } // auto-disconnect
 
   sl();

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ struct bind_functor : public adapts<T_functor>`
`161`	`161`	`{`
`162`	`162`	`}`
`163`	`163`
`164`		`-private:`
	`164`	`+ // public to avoid template friend declarations (used by visitor::do_visit_each())`
`165`	`165`	`/// The arguments bound to the functor.`
`166`	`166`	`std::tuple<bound_argument<T_bound>...> bound_;`
`167`	`167`	`};`
`@@ -202,6 +202,7 @@ struct bind_functor<-1, T_functor, T_type...> : public adapts<T_functor>`
`202`	`202`	`{`
`203`	`203`	`}`
`204`	`204`
	`205`	`+ // public to avoid template friend declarations (used by visitor::do_visit_each())`
`205`	`206`	`/// The argument bound to the functor.`
`206`	`207`	`std::tuple<bound_argument<T_type>...> bound_;`
`207`	`208`	`};`