From 80806fdfb76e771d55df38f67ed968819669e24e Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 29 Sep 2018 16:50:59 +0300
Subject: [PATCH 1/3] Enable Travis testing of feature branches

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ae2a925f..b2fd536f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ branches:
   only:
     - master
     - develop
+    - /feature\/.*/
 
 env:
   matrix:
@@ -218,8 +219,9 @@ matrix:
 
 
 install:
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..
-  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
   - git submodule update --init tools/build
   - git submodule update --init libs/config

From a65f604d544616a2715abda913fa5e3d01738d18 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 29 Sep 2018 17:20:25 +0300
Subject: [PATCH 2/3] Deprecate relaxed_heap.hpp, do not test (fails on g++-8)

---
 include/boost/pending/relaxed_heap.hpp | 3 +++
 test/Jamfile.v2                        | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/boost/pending/relaxed_heap.hpp b/include/boost/pending/relaxed_heap.hpp
index 8be44847..42da49e7 100644
--- a/include/boost/pending/relaxed_heap.hpp
+++ b/include/boost/pending/relaxed_heap.hpp
@@ -9,6 +9,9 @@
 #ifndef BOOST_RELAXED_HEAP_HEADER
 #define BOOST_RELAXED_HEAP_HEADER
 
+#include <boost/config/header_deprecated.hpp>
+BOOST_HEADER_DEPRECATED("the standard heap functions")
+
 #include <functional>
 #include <boost/property_map/property_map.hpp>
 #include <boost/optional.hpp>
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 263365cb..5e5871fe 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -50,7 +50,10 @@ test-suite graph_test :
     [ run dijkstra_heap_performance.cpp : 10000 ]
     [ run dijkstra_no_color_map_compare.cpp : 10000 ]
     [ run dominator_tree_test.cpp ]
-    [ run relaxed_heap_test.cpp : 5000 15000 ]
+
+    # Unused and deprecated.
+    #[ run relaxed_heap_test.cpp : 5000 15000 ]
+
     [ compile edge_list_cc.cpp ]
     [ compile filtered_graph_cc.cpp ]
     [ run generator_test.cpp ]

From 878d6f6b2217d1300b15b924b0264662fcd7176a Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 29 Sep 2018 18:26:26 +0300
Subject: [PATCH 3/3] Fix xcode configs (8.2, 8.1, 8.0 don't exist, were
 interpreted as default (9.4)

---
 .travis.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2fd536f..3610d2b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -193,21 +193,16 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-5.0
 
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
       osx_image: xcode8.3
 
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode8.2
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode8.1
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode8.0
+      osx_image: xcode8
 
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z