Added patch for boost function template bug.

Fri, 21 Jan 2011 16:28:41 -0800

author
Mark Palange (Mani) <palange@lindenlab.com>
date
Fri, 21 Jan 2011 16:28:41 -0800
changeset 10
3c1822e16252
parent 9
15d7dfc12f5e
child 11
2fc1855aaec1

Added patch for boost function template bug.

build-cmd.sh file | annotate | diff | revisions
function_template_for_c++0x.patch file | annotate | diff | revisions
     1.1 --- a/build-cmd.sh	Fri Jan 21 14:24:13 2011 -0800
     1.2 +++ b/build-cmd.sh	Fri Jan 21 16:28:41 2011 -0800
     1.3 @@ -31,6 +31,9 @@
     1.4      extract "$BOOST_ARCHIVE"
     1.5  #fi
     1.6  
     1.7 +# Add function template c++0x patch to boost. (for vs2010)
     1.8 +(cd "$BOOST_SOURCE_DIR/boost/function"; patch < "../../../function_template_for_c++0x.patch")
     1.9 +
    1.10  # Add boost coroutine to the linden lab boost build
    1.11  COROUTINE_TAR=boost-coroutine-2009-04-30.tar.gz
    1.12  tar xzf "$COROUTINE_TAR"
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/function_template_for_c++0x.patch	Fri Jan 21 16:28:41 2011 -0800
     2.3 @@ -0,0 +1,22 @@
     2.4 +Index: function_template.hpp
     2.5 +===================================================================
     2.6 +--- function_template.hpp	(revision 61663)
     2.7 ++++ function_template.hpp	(working copy)
     2.8 +@@ -536,7 +536,7 @@
     2.9 +           // objects, so we invoke through mem_fn() but we retain the
    2.10 +           // right target_type() values.
    2.11 +           if (f) {
    2.12 +-            this->assign_to(mem_fn(f), functor);
    2.13 ++            this->assign_to(boost::mem_fn(f), functor);
    2.14 +             return true;
    2.15 +           } else {
    2.16 +             return false;
    2.17 +@@ -549,7 +549,7 @@
    2.18 +           // objects, so we invoke through mem_fn() but we retain the
    2.19 +           // right target_type() values.
    2.20 +           if (f) {
    2.21 +-            this->assign_to_a(mem_fn(f), functor, a);
    2.22 ++            this->assign_to_a(boost::mem_fn(f), functor, a);
    2.23 +             return true;
    2.24 +           } else {
    2.25 +             return false;

mercurial