From 7273e1d6d01f90bc02eaaaa23e7457607ddc83ee Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 7 Jul 2017 14:39:04 +0300 Subject: [PATCH 1/2] Fix broken link in purpose.qbk --- doc/bind/purpose.qbk | 2 +- doc/html/bind.html | 4 ++-- doc/html/mem_fn.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/bind/purpose.qbk b/doc/bind/purpose.qbk index 146d8db..06422a2 100644 --- a/doc/bind/purpose.qbk +++ b/doc/bind/purpose.qbk @@ -178,7 +178,7 @@ Example: The last two examples are interesting in that they produce "self-contained" function objects. `bind(&X::f, x, _1)` stores a copy of `x`. `bind(&X::f, p, _1)` stores a copy of `p`, and since `p` is a -[@boost:/libs/smart_ptr/shared_ptr.htm `boost::shared_ptr`], the function +[@boost:/libs/smart_ptr/doc/html/smart_ptr.html#shared_ptr `boost::shared_ptr`], the function object retains a reference to its instance of `X` and will remain valid even when `p` goes out of scope or is `reset()`. diff --git a/doc/html/bind.html b/doc/html/bind.html index 9a2b0a9..5f35c5d 100644 --- a/doc/html/bind.html +++ b/doc/html/bind.html @@ -338,7 +338,7 @@ stores a copy of x. bind(&X::f, p, _1) stores a copy of p, and since - p is a boost::shared_ptr, the function object + p is a boost::shared_ptr, the function object retains a reference to its instance of X and will remain valid even when p goes out of scope or is reset(). @@ -1543,7 +1543,7 @@ - +

Last revised: June 06, 2015 at 16:07:44 GMT

Last revised: July 07, 2017 at 11:19:28 GMT
diff --git a/doc/html/mem_fn.html b/doc/html/mem_fn.html index 486d55e..528bfcf 100644 --- a/doc/html/mem_fn.html +++ b/doc/html/mem_fn.html @@ -543,7 +543,7 @@ - +

Last revised: June 06, 2015 at 16:07:47 GMT

Last revised: July 07, 2017 at 11:19:31 GMT
From 2f9ea82c6212b3dcc3efbf4e3cf4e3fea801724c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 7 Jul 2017 15:03:59 +0300 Subject: [PATCH 2/2] Use depinst.py in travis/appveyor.yml --- .travis.yml | 22 ++++------------------ appveyor.yml | 22 ++++------------------ 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f21bdc..f0674af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -244,25 +244,11 @@ install: - cd .. - git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule init libs/align - - git submodule init libs/assert - - git submodule init libs/config - - git submodule init libs/core - - git submodule init libs/function - - git submodule init libs/integer - - git submodule init libs/move - - git submodule init libs/mpl - - git submodule init libs/predef - - git submodule init libs/preprocessor - - git submodule init libs/smart_ptr - - git submodule init libs/static_assert - - git submodule init libs/throw_exception - - git submodule init libs/type_index - - git submodule init libs/type_traits - - git submodule init tools/build - - git submodule init tools/inspect - - git submodule update + - git submodule update --init tools/build + - git submodule update --init libs/config + - git submodule update --init tools/boostdep - cp -r $TRAVIS_BUILD_DIR/* libs/bind + - python tools/boostdep/depinst/depinst.py bind - ./bootstrap.sh - ./b2 headers diff --git a/appveyor.yml b/appveyor.yml index 5aa53fc..e46b375 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,25 +15,11 @@ install: - cd .. - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule init libs/align - - git submodule init libs/assert - - git submodule init libs/config - - git submodule init libs/core - - git submodule init libs/function - - git submodule init libs/integer - - git submodule init libs/move - - git submodule init libs/mpl - - git submodule init libs/predef - - git submodule init libs/preprocessor - - git submodule init libs/smart_ptr - - git submodule init libs/static_assert - - git submodule init libs/throw_exception - - git submodule init libs/type_index - - git submodule init libs/type_traits - - git submodule init tools/build - - git submodule init tools/inspect - - git submodule update + - git submodule update --init tools/build + - git submodule update --init libs/config + - git submodule update --init tools/boostdep - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\bind + - python tools/boostdep/depinst/depinst.py bind - bootstrap - b2 headers