From 1d5a18a0a152802fcbca91106f78ab8dfc366679 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glen.fernandes@gmail.com>
Date: Tue, 8 Jan 2019 23:43:47 -0500
Subject: [PATCH] Use cxxstd instead of cxxflags

---
 .travis.yml             | 12 ++++++------
 CHANGELOG.md            |  6 ++++++
 tools/build-and-test.sh |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fef31b5..32dc14ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
         - VARIANT=coverage
         - TOOLSET=gcc
         - COMPILER=g++-6
-        - CXXSTD=c++11
+        - CXXSTD=11
       before_install:
         - pip install --user https://github.com/codecov/codecov-python/archive/master.zip
       addons:
@@ -62,7 +62,7 @@ matrix:
         - VARIANT=valgrind
         - TOOLSET=gcc
         - COMPILER=g++-5
-        - CXXSTD=c++11
+        - CXXSTD=11
       addons:
         apt:
           packages:
@@ -80,7 +80,7 @@ matrix:
         - VARIANT=ubasan
         - TOOLSET=clang
         - COMPILER=clang++-3.8
-        - CXXSTD=c++11
+        - CXXSTD=11
         - UBSAN_OPTIONS='print_stacktrace=1'
         - PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH
       addons:
@@ -100,7 +100,7 @@ matrix:
         - VARIANT=release
         - TOOLSET=gcc
         - COMPILER=g++-8
-        - CXXSTD=c++11
+        - CXXSTD=11
       addons:
         apt:
           packages:
@@ -117,7 +117,7 @@ matrix:
         - VARIANT=debug
         - TOOLSET=clang
         - COMPILER=clang++
-        - CXXSTD=c++14
+        - CXXSTD=14
 
 install:
   - export BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
@@ -198,7 +198,7 @@ install:
 
 script:
   - |-
-    echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam
+    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
   - cd ../boost-root
   - libs/beast/tools/retry.sh libs/beast/tools/build-and-test.sh
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b17efe5..dbfea003 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 202
+
+* Use cxxstd instead of cxxflags
+
+--------------------------------------------------------------------------------
+
 Version 201
 
 * Decay bound arguments in handler wrapper parameters
diff --git a/tools/build-and-test.sh b/tools/build-and-test.sh
index 747bebd4..fa06549c 100755
--- a/tools/build-and-test.sh
+++ b/tools/build-and-test.sh
@@ -104,7 +104,7 @@ function build_bjam ()
      [[ $VARIANT == "ubasan" ]]; then
     b2 \
       define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
-      cxxstd=11 \
+      cxxstd=$CXXSTD \
       libs/beast/test/beast/core//fat-tests \
       libs/beast/test/beast/http//fat-tests \
       libs/beast/test/beast/websocket//fat-tests \
@@ -115,7 +115,7 @@ function build_bjam ()
   else
     b2 \
       define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
-      cxxstd=11 \
+      cxxstd=$CXXSTD \
       libs/beast/test//fat-tests \
       libs/beast/example \
       toolset=$TOOLSET \