From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Sun, 20 Nov 2011 21:14:56 +0000 (+0000)
Subject: binders.h: Fix examples in doxygen comments and suggest using std::bind instead.
X-Git-Tag: releases/gcc-4.7.0~2081
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=215c6c972dd84d3124a4a6f522dde47bc54fed3a;p=thirdparty%2Fgcc.git

binders.h: Fix examples in doxygen comments and suggest using std::bind instead.

	* include/backward/binders.h: Fix examples in doxygen comments and
	suggest using std::bind instead.

From-SVN: r181535
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a1fb30b7a30a..5515c0778d24 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-20  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/backward/binders.h: Fix examples in doxygen comments and
+	suggest using std::bind instead.
+
 2011-11-20  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* doc/xml/manual/status_cxx2011.xml: Fix docbook markup.
diff --git a/libstdc++-v3/include/backward/binders.h b/libstdc++-v3/include/backward/binders.h
index f98b56aaedeb..076f8d2e219c 100644
--- a/libstdc++-v3/include/backward/binders.h
+++ b/libstdc++-v3/include/backward/binders.h
@@ -80,7 +80,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *
    *  The type @c binder2nd and its creator function @c bind2nd do the same
    *  thing, but the stored argument is passed as the second parameter instead
-   *  of the first, e.g., @c bind2nd(std::minus<float>,1.3) will create a
+   *  of the first, e.g., @c bind2nd(std::minus<float>(),1.3) will create a
    *  functor whose @c operator() accepts a floating-point number, subtracts
    *  1.3 from it, and returns the result. (If @c bind1st had been used,
    *  the functor would perform <em>1.3 - x</em> instead.
@@ -89,10 +89,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  calling algorithms. Their return values will be temporary objects.
    *  (The goal is to not require you to type names like
    *  @c std::binder1st<std::plus<int>> for declaring a variable to hold the
-   *  return value from @c bind1st(std::plus<int>,5).
+   *  return value from @c bind1st(std::plus<int>(),5).
    *
    *  These become more useful when combined with the composition functions.
    *
+   *  These functions are deprecated in C++11 and can be replaced by
+   *  @c std::bind (or @c std::tr1::bind) which is more powerful and flexible,
+   *  supporting functions with any number of arguments.  Uses of @c bind1st
+   *  can be replaced by @c std::bind(f, x, std::placeholders::_1) and
+   *  @c bind2nd by @c std::bind(f, std::placeholders::_1, x).
    *  @{
    */
   /// One of the @link binders binder functors@endlink.