Merge branch 'develop'

Merge branch 'develop' of https://github.com/boostorg/bind into develop
Merge pull request #3 from danieljames/develop
2026-04-15 06:06:06 +02:00 · 2014-02-05 05:22:20 +02:00 · 2013-12-18 19:04:20 +02:00 · 2013-12-16 15:03:04 -08:00 · 2013-12-15 17:27:54 +00:00 · 2013-12-12 02:57:54 +02:00
6 changed files with 52 additions and 42 deletions
--- a/bind.html
+++ b/bind.html
@@ -272,7 +272,7 @@ bind(&amp;X::f, p, _1)(i);			// (<i>internal copy of p</i>)-&gt;f(i)
 		</p>
 		<P>This feature of <b>bind</b> can be used to perform function composition. See <A href="bind_as_compose.cpp">
 				bind_as_compose.cpp</A> for an example that demonstrates how to use <b>bind</b>
-			to achieve similar functionality to <A href="../compose/index.htm">Boost.Compose</A>.
+			to achieve similar functionality to <A href="http://www.boost.org/doc/libs/1_31_0/libs/compose/index.htm">Boost.Compose</A>.
 		</P>
 		<p>Note that the first argument - the bound function object - is not evaluated, 
 			even when it's a function object that is produced by <STRONG>bind</STRONG> or a 
@@ -390,7 +390,7 @@ void connect()
 		<p>As a general rule, the function objects generated by <b>bind</b> take their 
 			arguments by reference and cannot, therefore, accept non-const temporaries or 
 			literal constants. This is an inherent limitation of the C++ language in its 
-			current (2003) incarnation, known as <A href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">
+			current (2003) incarnation, known as <A href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm">
 				the forwarding problem</A>. (It will be fixed in the next standard, usually 
 			called C++0x.)</p>
 		<p>The library uses signatures of the form
--- a/include/boost/bind/arg.hpp
+++ b/include/boost/bind/arg.hpp
@@ -21,6 +21,7 @@

 #include <boost/config.hpp>
 #include <boost/is_placeholder.hpp>
+#include <boost/static_assert.hpp>

 namespace boost
 {
@@ -33,8 +34,7 @@ template< int I > struct arg

    template< class T > arg( T const & /* t */ )
    {
-        // static assert I == is_placeholder<T>::value
-        typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
+        BOOST_STATIC_ASSERT( I == is_placeholder<T>::value );
    }
 };

--- a/mem_fn.html
+++ b/mem_fn.html
@@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 	<head>
 		<title>Boost: mem_fn.hpp documentation</title>
@@ -146,7 +145,7 @@ void k(std::vector&lt;boost::shared_ptr&lt;X&gt; &gt; const &amp; v)
 		<p>
 			Yes. For simple uses, <b>mem_fn</b> provides additional functionality that the 
 			standard adaptors do not. Complicated expressions that use <b>std::bind1st</b>, <b>std::bind2nd</b>
-			or <a href="../compose/index.htm"><b>Boost.Compose</b></a> along with the 
+			or <a href="http://www.boost.org/doc/libs/1_31_0/libs/compose/index.htm"><b>Boost.Compose</b></a> along with the 
 			standard adaptors can be rewritten using <a href="bind.html"><b>boost::bind</b></a>
 			that automatically takes advantage of <b>mem_fn</b>.
 		</p>
--- a/test/bind_cv_test.cpp
+++ b/test/bind_cv_test.cpp
@@ -33,6 +33,12 @@

 struct X
 {
+    // SGI-related compilers have odd compiler-synthesized ctors dtors
+    #ifdef __PATHSCALE__
+    X() {}
+    ~X() {}
+    #endif
+
    int operator()()
    {
        return 17041;
--- a/test/bind_stateful_test.cpp
+++ b/test/bind_stateful_test.cpp
@@ -43,6 +43,11 @@ public:
    {
    }

+    // SGI-related compilers have odd compiler-synthesized ctors and dtors
+    #ifdef __PATHSCALE__
+    ~X() {}
+    #endif
+
    int state() const
    {
        return state_;
--- a/test/mem_fn_eq_test.cpp
+++ b/test/mem_fn_eq_test.cpp
@@ -39,128 +39,128 @@ struct X
    // 0

    int mf0_1() { return 0; }
-    int mf0_2() { return 0; }
+    int mf0_2() { return 1; }

    int cmf0_1() const { return 0; }
-    int cmf0_2() const { return 0; }
+    int cmf0_2() const { return 1; }

    void mf0v_1() {}
-    void mf0v_2() {}
+    void mf0v_2() { static int x; ++x; }

    void cmf0v_1() const {}
-    void cmf0v_2() const {}
+    void cmf0v_2() const { static int x; ++x; }

    // 1

    int mf1_1(int) { return 0; }
-    int mf1_2(int) { return 0; }
+    int mf1_2(int) { return 1; }

    int cmf1_1(int) const { return 0; }
-    int cmf1_2(int) const { return 0; }
+    int cmf1_2(int) const { return 1; }

    void mf1v_1(int) {}
-    void mf1v_2(int) {}
+    void mf1v_2(int) { static int x; ++x; }

    void cmf1v_1(int) const {}
-    void cmf1v_2(int) const {}
+    void cmf1v_2(int) const { static int x; ++x; }

    // 2

    int mf2_1(int, int) { return 0; }
-    int mf2_2(int, int) { return 0; }
+    int mf2_2(int, int) { return 1; }

    int cmf2_1(int, int) const { return 0; }
-    int cmf2_2(int, int) const { return 0; }
+    int cmf2_2(int, int) const { return 1; }

    void mf2v_1(int, int) {}
-    void mf2v_2(int, int) {}
+    void mf2v_2(int, int) { static int x; ++x; }

    void cmf2v_1(int, int) const {}
-    void cmf2v_2(int, int) const {}
+    void cmf2v_2(int, int) const { static int x; ++x; }

    // 3

    int mf3_1(int, int, int) { return 0; }
-    int mf3_2(int, int, int) { return 0; }
+    int mf3_2(int, int, int) { return 1; }

    int cmf3_1(int, int, int) const { return 0; }
-    int cmf3_2(int, int, int) const { return 0; }
+    int cmf3_2(int, int, int) const { return 1; }

    void mf3v_1(int, int, int) {}
-    void mf3v_2(int, int, int) {}
+    void mf3v_2(int, int, int) { static int x; ++x; }

    void cmf3v_1(int, int, int) const {}
-    void cmf3v_2(int, int, int) const {}
+    void cmf3v_2(int, int, int) const { static int x; ++x; }

    // 4

    int mf4_1(int, int, int, int) { return 0; }
-    int mf4_2(int, int, int, int) { return 0; }
+    int mf4_2(int, int, int, int) { return 1; }

    int cmf4_1(int, int, int, int) const { return 0; }
-    int cmf4_2(int, int, int, int) const { return 0; }
+    int cmf4_2(int, int, int, int) const { return 1; }

    void mf4v_1(int, int, int, int) {}
-    void mf4v_2(int, int, int, int) {}
+    void mf4v_2(int, int, int, int) { static int x; ++x; }

    void cmf4v_1(int, int, int, int) const {}
-    void cmf4v_2(int, int, int, int) const {}
+    void cmf4v_2(int, int, int, int) const { static int x; ++x; }

    // 5

    int mf5_1(int, int, int, int, int) { return 0; }
-    int mf5_2(int, int, int, int, int) { return 0; }
+    int mf5_2(int, int, int, int, int) { return 1; }

    int cmf5_1(int, int, int, int, int) const { return 0; }
-    int cmf5_2(int, int, int, int, int) const { return 0; }
+    int cmf5_2(int, int, int, int, int) const { return 1; }

    void mf5v_1(int, int, int, int, int) {}
-    void mf5v_2(int, int, int, int, int) {}
+    void mf5v_2(int, int, int, int, int) { static int x; ++x; }

    void cmf5v_1(int, int, int, int, int) const {}
-    void cmf5v_2(int, int, int, int, int) const {}
+    void cmf5v_2(int, int, int, int, int) const { static int x; ++x; }

    // 6

    int mf6_1(int, int, int, int, int, int) { return 0; }
-    int mf6_2(int, int, int, int, int, int) { return 0; }
+    int mf6_2(int, int, int, int, int, int) { return 1; }

    int cmf6_1(int, int, int, int, int, int) const { return 0; }
-    int cmf6_2(int, int, int, int, int, int) const { return 0; }
+    int cmf6_2(int, int, int, int, int, int) const { return 1; }

    void mf6v_1(int, int, int, int, int, int) {}
-    void mf6v_2(int, int, int, int, int, int) {}
+    void mf6v_2(int, int, int, int, int, int) { static int x; ++x; }

    void cmf6v_1(int, int, int, int, int, int) const {}
-    void cmf6v_2(int, int, int, int, int, int) const {}
+    void cmf6v_2(int, int, int, int, int, int) const { static int x; ++x; }

    // 7

    int mf7_1(int, int, int, int, int, int, int) { return 0; }
-    int mf7_2(int, int, int, int, int, int, int) { return 0; }
+    int mf7_2(int, int, int, int, int, int, int) { return 1; }

    int cmf7_1(int, int, int, int, int, int, int) const { return 0; }
-    int cmf7_2(int, int, int, int, int, int, int) const { return 0; }
+    int cmf7_2(int, int, int, int, int, int, int) const { return 1; }

    void mf7v_1(int, int, int, int, int, int, int) {}
-    void mf7v_2(int, int, int, int, int, int, int) {}
+    void mf7v_2(int, int, int, int, int, int, int) { static int x; ++x; }

    void cmf7v_1(int, int, int, int, int, int, int) const {}
-    void cmf7v_2(int, int, int, int, int, int, int) const {}
+    void cmf7v_2(int, int, int, int, int, int, int) const { static int x; ++x; }

    // 8

    int mf8_1(int, int, int, int, int, int, int, int) { return 0; }
-    int mf8_2(int, int, int, int, int, int, int, int) { return 0; }
+    int mf8_2(int, int, int, int, int, int, int, int) { return 1; }

    int cmf8_1(int, int, int, int, int, int, int, int) const { return 0; }
-    int cmf8_2(int, int, int, int, int, int, int, int) const { return 0; }
+    int cmf8_2(int, int, int, int, int, int, int, int) const { return 1; }

    void mf8v_1(int, int, int, int, int, int, int, int) {}
-    void mf8v_2(int, int, int, int, int, int, int, int) {}
+    void mf8v_2(int, int, int, int, int, int, int, int) { static int x; ++x; }

    void cmf8v_1(int, int, int, int, int, int, int, int) const {}
-    void cmf8v_2(int, int, int, int, int, int, int, int) const {}
+    void cmf8v_2(int, int, int, int, int, int, int, int) const { static int x; ++x; }

 };
Author	SHA1	Message	Date
Peter Dimov	1480db5679	Merge branch 'develop'	2014-02-05 05:22:20 +02:00
Peter Dimov	f53694ef25	Merge branch 'develop' of https://github.com/boostorg/bind into develop	2013-12-18 19:04:20 +02:00
Peter Dimov	0afd49b884	Merge pull request #3 from danieljames/develop Link to compose in old version of boost.	2013-12-16 15:03:04 -08:00
Daniel James	dd67e3f785	Link to compose from old version of boost. Compose isn't included in modular boost, so there's nothing to link to. I changed it to link to an old version which still has compose documentation. It might be better to rewrite it?	2013-12-15 17:27:54 +00:00
Peter Dimov	c92a49d5c2	Merge commit 'f7e101e928c745199436374f944f0438b97dee28' into develop	2013-12-12 02:57:54 +02:00
Peter Dimov	a6b17d9001	Switch to BOOST_STATIC_ASSERT in arg.hpp per the patch in #8844 .	2013-12-12 00:12:56 +02:00
Peter Dimov	ea05f23163	Fixed mem_fn_eq_test to work with /OPT:ICF as per the patch in #8734 by Mike Liang.	2013-12-11 23:58:19 +02:00
Peter Dimov	fafb6bb650	Merge branch 'topic/silence_warning' of https://github.com/timblechmann/bind into develop	2013-12-07 19:10:42 +02:00
Peter Dimov	f7e101e928	Merge branch 'develop'	2013-12-07 19:05:57 +02:00
Peter Dimov	166c4b6be7	Merge from master to create a merge point.	2013-12-07 19:03:34 +02:00
Peter Dimov	8414233b9c	Revert "Bind: Remove obsolete MSVC version check" This reverts commit `9955139c65`.	2013-12-07 18:54:00 +02:00
Peter Dimov	15d6d6ac95	Revert "Remove obsolete MSVC check from pragma guard" This reverts commit `5e2fc717f0`.	2013-12-07 18:53:27 +02:00
Peter Dimov	ba117db120	Revert "Bind: Remove obsolete GCC version check." This reverts commit `5b2cf44de5`.	2013-12-07 18:53:01 +02:00
Peter Dimov	f5c95610b6	Revert "Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION" This reverts commit `af136e483d`.	2013-12-07 18:52:39 +02:00
Peter Dimov	ce0fc0f69a	Revert "Simplify multi-component ifdefs containing BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION" This reverts commit `0f66412487`.	2013-12-07 18:51:53 +02:00
Peter Dimov	aa8a94273d	Revert "Remove remaining occurances of BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION" This reverts commit `7ff6524bd1`.	2013-12-07 18:50:56 +02:00
Tim Blechmann	92ff08b873	bind: silence warning with gcc	2013-12-07 14:37:28 +01:00
Michel Morin	6315df35d6	Merge r86524 (Correct broken links to C++ standard papers); fixes #9212 [SVN r86673]	2013-11-13 03:22:55 +00:00
Michel Morin	96fd1e7036	Correct broken links to C++ standard papers. Refs #9212 . [SVN r86524]	2013-10-30 12:51:24 +00:00
Stephen Kelly	7ff6524bd1	Remove remaining occurances of BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION These evaded scripting. [SVN r86249]	2013-10-11 23:22:36 +00:00
Stephen Kelly	0f66412487	Simplify multi-component ifdefs containing BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION [SVN r86248]	2013-10-11 23:20:59 +00:00
Stephen Kelly	af136e483d	Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION Process #ifndef...#endif conditions. [SVN r86244]	2013-10-11 23:15:00 +00:00
Stephen Kelly	5b2cf44de5	Bind: Remove obsolete GCC version check. [SVN r86106]	2013-10-01 08:42:35 +00:00
Stephen Kelly	5e2fc717f0	Remove obsolete MSVC check from pragma guard git grep -h -B1 "^#\s*pragma once" \| grep -v pragma \| sort \| uniq is now clean. [SVN r85952]	2013-09-26 13:02:51 +00:00
Stephen Kelly	9955139c65	Bind: Remove obsolete MSVC version check [SVN r85938]	2013-09-26 09:42:51 +00:00
Peter Dimov	da3580cc14	Apply suggested IBM C++ fix. Refs #5792 . [SVN r75391]	2011-11-07 18:25:33 +00:00
Bryce Adelstein-Lelbach	27003baf12	Pathscale-4.0 configuration code/workarounds. [SVN r68142]	2011-01-14 02:59:34 +00:00
Marshall Clow	3d60d74ff0	Doc patch; refs #4532 [SVN r66973]	2010-12-02 13:17:09 +00:00
Daniel James	f89c41dc7b	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Peter Dimov	7aa58cf653	Fix version check, as g++ 4.1 still has the PCH bug. Refs #4172 . [SVN r62251]	2010-05-26 19:34:10 +00:00
Peter Dimov	1bf8cd6c7a	Fix Borland regression. Refs #3003 . [SVN r58093]	2009-12-02 10:47:01 +00:00
Peter Dimov	e5d99ce085	Make mem_fn work with overloaded unary operator&. Refs #3003 . Sorry it took so long. [SVN r58073]	2009-12-01 02:24:53 +00:00
Peter Dimov	17282c97c2	Extend Borland workaround to 6.2 and above. [SVN r57954]	2009-11-26 21:02:04 +00:00
John Maddock	f02b090fe8	Warning suppressions in Boost.Bind. Fixes #3601. [SVN r57542]	2009-11-10 13:26:43 +00:00
Troy D. Straszheim	f3da835e0b	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	73fc778b61	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Steven Watanabe	26ee2825fe	Make protect use the same approximation of perfect forwarding as plain bind. [SVN r54385]	2009-06-26 22:31:15 +00:00
Frank Mori Hess	dc1e4dbfae	Use static boost::arg placeholders for gcc 4.0.1, since it has a bug that prevents forwarding placeholders as const references when using the static inline function placeholders. [SVN r52384]	2009-04-14 13:45:59 +00:00
Peter Dimov	45a1f1434b	Add ref_compare for weak_ptr. Refs #2849 . [SVN r51979]	2009-03-26 00:43:14 +00:00
Peter Dimov	bc50ab0ba3	Refs #2128 (fixed in trunk.) [SVN r51512]	2009-03-01 17:04:14 +00:00
Peter Dimov	010349ec9b	Refs #2127 (fixed in trunk). [SVN r51511]	2009-03-01 16:31:53 +00:00
Peter Dimov	8ae9e8460d	Borland 6.10 still needs the workaround; fails bind_dm_test without it. [SVN r51510]	2009-03-01 16:06:44 +00:00
Peter Dimov	5d49fb45d0	Make bind.hpp and mem_fn.hpp forward to bind/bind.hpp and bind/mem_fn.hpp. (Ref #2238 ) [SVN r51489]	2009-02-28 21:40:27 +00:00
Peter Dimov	4000680b6a	Copy mem_fn.hpp to bind/ [SVN r51488]	2009-02-28 21:27:51 +00:00
Peter Dimov	851903fcc4	Copy bind.hpp into bind/ [SVN r51487]	2009-02-28 21:26:59 +00:00
John Maddock	1d79533df7	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
Michael A. Jackson	f09a7a5747	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	0b72bfbd9b	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	61519fcae2	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Peter Dimov	48c5a6e682	Fix #2245 . [SVN r48840]	2008-09-17 23:07:33 +00:00
Ronald Garcia	1b292ee487	For building the ref docs stand-alone. [SVN r47690]	2008-07-22 14:58:14 +00:00
Ronald Garcia	0dd5dae4e8	Added documentation for unwrap_ref. [SVN r47689]	2008-07-22 14:55:05 +00:00
Peter Dimov	203ca82ef2	bind( type<R>(), f, ... ) now works when f is a member function. [SVN r45619]	2008-05-21 19:49:47 +00:00
Peter Dimov	037a4d1976	Add ref_fn_test.cpp per #1846 . [SVN r44704]	2008-04-21 21:29:28 +00:00
Peter Dimov	dfd3da2cc4	Fix #1643 . [SVN r43323]	2008-02-19 15:40:58 +00:00
Peter Dimov	aef08dd0cd	Fix #1642 . [SVN r43321]	2008-02-19 15:09:10 +00:00
Peter Dimov	ef993c777a	Fix #1646 . [SVN r43320]	2008-02-19 14:59:28 +00:00
Peter Dimov	f58543ac11	Fix #1641 . [SVN r43319]	2008-02-19 14:51:10 +00:00
Peter Dimov	f1afd17717	Added support for &&, \|\| [SVN r43269]	2008-02-15 18:40:36 +00:00
Markus Schöpflin	e73f08edee	Modified spelling of my surname to avoid problems with non-ASCII characters. [SVN r42436]	2008-01-03 10:04:39 +00:00
Vladimir Prus	3c24cbedf6	Remove V1 Jamfiles [SVN r38516]	2007-08-08 19:02:26 +00:00
Peter Dimov	79f8680eda	Fix #997 [SVN r38165]	2007-07-07 17:41:54 +00:00
Peter Dimov	e163aeb563	Use object placeholders for g++ 4.1+, reported and PCH-tested by Daniel Walker [SVN r38164]	2007-07-07 17:22:26 +00:00
Peter Dimov	ce24d4f735	Fixed to compile [SVN r37357]	2007-04-04 21:30:32 +00:00
Peter Dimov	41d9fbc317	License update [SVN r35988]	2006-11-10 18:27:05 +00:00
Peter Dimov	2f595f53f5	License/copyright edits [SVN r35954]	2006-11-09 19:29:42 +00:00
Beman Dawes	c746cf26de	Add copyright, license [SVN r35905]	2006-11-07 19:11:57 +00:00
Peter Dimov	a695360c4f	Borland fix [SVN r35661]	2006-10-18 17:36:50 +00:00
Peter Dimov	0aadd1805d	Rvalue overloads (suggested by Herve Bronnimann) [SVN r35640]	2006-10-16 19:11:29 +00:00
Douglas Gregor	0cc198acc2	Work around ADL bug in GCC 3.3 that is causing failures in the Signals library [SVN r35224]	2006-09-20 13:07:20 +00:00
Peter Dimov	b272145f3e	Moved the specialization into namespace boost [SVN r34477]	2006-07-07 19:09:16 +00:00
Peter Dimov	bfe10df38a	is_placeholder, is_bind_expression added. [SVN r34468]	2006-07-06 13:47:26 +00:00
Peter Dimov	c69a4ad382	Fixed a visit_each-related bug exposed by strict two-phase lookup [SVN r33761]	2006-04-21 13:14:58 +00:00
Peter Dimov	683d699e4a	Added diagnostic output. [SVN r33754]	2006-04-21 11:55:39 +00:00